Merge pull request #820 from mailpoet/translations

Fix translations based on translators' feedback [MAILPOET-819]

assets/js/src/newsletter_editor/components/save.js

@@ -169,7 +169,7 @@ define([
     },
     beforeSave: function() {
       // TODO: Add a loading animation instead
-      this.$('.mailpoet_autosaved_at').text('Saving...');
+      this.$('.mailpoet_autosaved_at').text(MailPoet.I18n.t('saving'));
     },
     afterSave: function(json, response) {
       this.validateNewsletter(json);

lib/Config/Menu.php

@@ -75,7 +75,8 @@ class Menu {
       add_screen_option('per_page', array(
         'label' => _x(
           'Number of newsletters per page',
-          'newsletters per page (screen options)'
+          'newsletters per page (screen options)',
+          'mailpoet'
         ),
         'option' => 'mailpoet_newsletters_per_page'
       ));
@@ -97,7 +98,8 @@ class Menu {
       add_screen_option('per_page', array(
         'label' => _x(
           'Number of forms per page',
-          'forms per page (screen options)'
+          'forms per page (screen options)',
+          'mailpoet'
         ),
         'option' => 'mailpoet_forms_per_page'
       ));
@@ -119,7 +121,8 @@ class Menu {
       add_screen_option('per_page', array(
         'label' => _x(
           'Number of subscribers per page',
-          'subscribers per page (screen options)'
+          'subscribers per page (screen options)',
+          'mailpoet'
         ),
         'option' => 'mailpoet_subscribers_per_page'
       ));
@@ -142,7 +145,8 @@ class Menu {
       add_screen_option('per_page', array(
         'label' => _x(
           'Number of segments per page',
-          'segments per page (screen options)'
+          'segments per page (screen options)',
+          'mailpoet'
         ),
         'option' => 'mailpoet_segments_per_page'
       ));
@@ -542,4 +546,4 @@ class Menu {
       $notice->displayWPNotice();
     }
   }
-}
+}

lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php

@@ -116,7 +116,7 @@ class NewsletterBlank121Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n<p>It's time to design your newsletter! 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')
+                    "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>Columns</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",

lib/Config/PopulatorData/Templates/NewsletterBlank12Column.php

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

lib/Config/PopulatorData/Templates/NewsletterBlank13Column.php

@@ -116,7 +116,7 @@ class NewsletterBlank13Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started! </strong></h1>\n<p></p>\n<p>It's time to design your newsletter! 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')
+                    "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>Columns</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",

lib/Config/PopulatorData/Templates/NewsletterBlank1Column.php

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

lib/Config/PopulatorData/Templates/StoreDiscount.php

@@ -320,7 +320,7 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p><em>Terms and Conditions:</em></p>\n<ul>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Must be used by midnight EST December 15 2016.</span></li>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Discount does not include shipping.</span></li>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Cannot be used in conjunction with any other offer.</span></li>\n</ul>", 'mailpoet')
+              "text" => __("<p><em>Terms and Conditions:</em></p>\n<ul>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Must be used by midnight EST December 15 2036.</span></li>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Discount does not include shipping.</span></li>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Cannot be used in conjunction with any other offer.</span></li>\n</ul>", 'mailpoet')
             ), array(
               "type" => "social",
               "iconSet" => "grey",

views/form/templates/settings/field_form.hbs

@@ -13,7 +13,7 @@
       id="field_type"
       name="type"
       data-parsley-required="true"
-      data-parsley-required-message="<%= __('Please specify a type') %>"
+      data-parsley-required-message="<%= __('Please specify a type.') %>"
     >
       <option value="">--</option>
       <option
@@ -50,7 +50,7 @@
       name="name"
       value="{{ name }}"
       data-parsley-required="true"
-      data-parsley-required-message="<%= __('Please specify a name') %>"
+      data-parsley-required-message="<%= __('Please specify a name.') %>"
     />
   </p>
   <hr />

views/forms.html

@@ -21,7 +21,7 @@
     'selectedAllLabel': __('All %d forms are selected.'),
     'selectAllLink': __('Select all forms on all pages'),
     'clearSelection': __('Clear selection'),
-    'permanentlyDeleted': __('%d forms permanently deleted'),
+    'permanentlyDeleted': __('%d forms permanently deleted.'),
     'selectBulkAction': __('Select bulk action'),
     'bulkActions': __('Bulk Actions'),
     'apply': __('Apply'),

views/newsletter/editor.html

@@ -334,6 +334,7 @@
     'previewShouldOpenInNewTab': __('Your preview should open in a new tab. Please ensure your browser is not blocking popups from this page.'),
     'newsletterPreview': __('Newsletter Preview'),
     'newsletterBodyIsCorrupted': __('Contents of this newsletter are corrupted and may be lost, you may need to add new content to this newsletter, or create a new one. If possible, please contact us and report this issue.'),
+    'saving': __('Saving...'),
   }) %>
 <% endblock %>
 

views/newsletters.html

@@ -27,13 +27,13 @@
     'tabNotificationTitle': __('Post Notifications'),
 
     'searchLabel': __('Search'),
-    'loadingItems': __('Loading newsletters...'),
+    'loadingItems': __('Loading emails...'),
     '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."),
-    'selectAllLabel': __('All newsletters on this page are selected.'),
+    'selectAllLabel': __('All emails on this page are selected.'),
-    'selectedAllLabel': __('All %d newsletters are selected.'),
+    'selectedAllLabel': __('All %d emails are selected.'),
-    'selectAllLink': __('Select all newsletters on all pages'),
+    'selectAllLink': __('Select all emails on all pages'),
     'clearSelection': __('Clear selection'),
-    'permanentlyDeleted': __('%d newsletters were permanently deleted.'),
+    'permanentlyDeleted': __('%d emails were permanently deleted.'),
     'selectBulkAction': __('Select bulk action'),
     'bulkActions': __('Bulk Actions'),
     'apply': __('Apply'),
@@ -66,12 +66,12 @@
     'viewHistory': __('View history'),
     'createdOn': __('Created on'),
     'lastModifiedOn': __('Last modified on'),
-    'oneNewsletterTrashed': __('1 newsletter was moved to the trash.'),
+    'oneNewsletterTrashed': __('1 email was moved to the trash.'),
-    'multipleNewslettersTrashed': __('%$1d newsletters were moved to the trash.'),
+    'multipleNewslettersTrashed': __('%$1d emails were moved to the trash.'),
-    'oneNewsletterDeleted': __('1 newsletter was permanently deleted.'),
+    'oneNewsletterDeleted': __('1 email was permanently deleted.'),
-    'multipleNewslettersDeleted': __('%$1d newsletters were permanently deleted.'),
+    'multipleNewslettersDeleted': __('%$1d emails were permanently deleted.'),
-    'oneNewsletterRestored': __('1 newsletter has been recovered from the trash.'),
+    'oneNewsletterRestored': __('1 email has been restored from the Trash.'),
-    'multipleNewslettersRestored': __('%$1d newsletters have been recovered from the trash.'),
+    'multipleNewslettersRestored': __('%$1d emails have been restored from the Trash.'),
     'trash': __('Trash'),
     'moveToTrash': __('Move to trash'),
     'edit': __('Edit'),
@@ -132,8 +132,8 @@
     'second': __('2nd'),
     'third': __('3rd'),
     'nth': __('%$1dth'),
-    'last': __('last'),
+    'last': _x('last', 'e.g. monthly every last Monday'),
-    'next': __('Next'),
+    'next': _x('Next', 'Button label: Next step'),
 
     'selectEventToSendWelcomeEmail': __('When is this Welcome Email sent?'),
 

views/segments.html

@@ -32,14 +32,14 @@
     'unsubscribed': __('Unsubscribed'),
     'bounced': __('Bounced'),
     'createdOn': __('Created on'),
-    'oneSegmentTrashed': __('1 list was moved to the trash'),
+    'oneSegmentTrashed': __('1 list was moved to the trash.'),
-    'multipleSegmentsTrashed': __('%$1d lists were moved to the trash'),
+    'multipleSegmentsTrashed': __('%$1d lists were moved to the trash.'),
-    'oneSegmentDeleted': __('1 list was permanently deleted'),
+    'oneSegmentDeleted': __('1 list was permanently deleted.'),
     'multipleSegmentsDeleted': __('%$1d lists were permanently deleted.'),
-    'oneSegmentRestored': __('1 list has been restored from the trash'),
+    'oneSegmentRestored': __('1 list has been restored from the Trash.'),
-    'multipleSegmentsRestored': __('%$1d lists have been restored from the trash'),
+    'multipleSegmentsRestored': __('%$1d lists have been restored from the Trash.'),
     'duplicate': __('Duplicate'),
-    'listDuplicated': __('List "%$1s" has been duplicated'),
+    'listDuplicated': __('List "%$1s" has been duplicated.'),
     'update': __('Update'),
     'forceSync': __('Force Sync'),
     'readMore': __('Read More'),

views/settings.html

@@ -46,7 +46,7 @@
           type="submit"
           class="button button-primary"
           name="submit"
-          value="<%= ('Save settings') %>"
+          value="<%= __('Save settings') %>"
         />
       </p>
     </form>

views/settings/advanced.html

@@ -31,7 +31,7 @@
           <%= __('Select what will activate your newsletter queue.') %>
           <a href="http://docs.mailpoet.com/article/129-what-is-the-newsletter-task-scheduler"
              target="_blank"
-          ><%= __('Read more.') %></a>
+          ><%= _x('Read more.', 'support article link label') %></a>
         </p>
       </th>
       <td>
@@ -114,7 +114,7 @@
           <a
             href="http://docs.mailpoet.com/article/130-sharing-your-data-with-us"
             target="_blank"
-          ><%= __('Read more.') %></a>
+          ><%= _x('Read more.', 'support article link label') %></a>
         </p>
       </th>
       <td>
@@ -168,7 +168,7 @@
     $(function() {
       $('#mailpoet_reinstall').on('click', function() {
         if(confirm(
-          "<%= __('Are you sure? All of your MailPoet data will be permanently erased (newsletters, statistics, subscribers, etc.)') %>"
+          "<%= __('Are you sure? All of your MailPoet data will be permanently erased (newsletters, statistics, subscribers, etc.).') %>"
         )) {
           MailPoet.Modal.loading(true);
           MailPoet.Ajax.post({

views/settings/basics.html

@@ -47,7 +47,7 @@
           <%= __("Email notifications") %>
         </label>
         <p class="description">
-          <%= __('These email addresses will receive notifications (separate each address with a comma)') %>
+          <%= __('These email addresses will receive notifications (separate each address with a comma).') %>
         </p>
       </th>
       <td>
@@ -148,7 +148,7 @@
           <%= __('Subscribe in registration form') %>
         </label>
         <p class="description">
-          <%= __('Allow users who register as a WordPress user on your website to subscribe to a MailPoet list (in addition to the "WordPress Users" list.)') %>
+          <%= __('Allow users who register as a WordPress user on your website to subscribe to a MailPoet list (in addition to the "WordPress Users" list).') %>
         </p>
       </th>
       <td>

views/settings/mta.html

@@ -120,11 +120,7 @@
     <p class="mailpoet_description">
       <strong><%= __('For SMTP, SendGrid or Amazon SES') %></strong>
       <br />
-      <%= __('We only recommend using a third-party service if you are a technical user. Tread carefully.') %>
+      <%= __('We only recommend using a third-party service if you are a technical user.') %>
-      <a
-        href="http://docs.mailpoet.com/article/154-why-use-an-email-service-provider"
-        target="_blank"
-      ><%= __('Read more.') %></a>
     </p>
 
     <div class="mailpoet_status">

views/settings/signup.html

@@ -130,7 +130,7 @@
           <%= __('Email content') %>
         </label>
         <p class="description">
-          <%= __("Don't forget to include:<br /><br />[activation_link]Confirm your subscription.[/activation_link].<br /><br />Optional: [lists_to_confirm].") %>
+          <%= __("Don't forget to include:<br /><br />[activation_link]Confirm your subscription.[/activation_link]<br /><br />Optional: [lists_to_confirm].") %>
         </p>
       </th>
       <td>

views/subscribers/importExport/export.html

@@ -45,7 +45,7 @@
     <tr>
       <th scope="row">
         <label for="export_lists">
-          <%= __('Pick a list') %>
+          <%= __('Pick one or multiple lists') %>
         </label>
       </th>
       <td>

views/subscribers/importExport/import.html

@@ -34,12 +34,12 @@
 <%= localize({
 'noMailChimpLists': __('No active lists found'),
 'serverError': __('Server error:'),
-'select': __('Selecto', 'Form input type'),
+'select': __('Select', 'Form input type'),
 'csvKBLink':  csvKBLink,
 'wrongFileFormat': __('Only comma-separated (CSV) file formats are supported.'),
 'maxPostSizeNotice': __('Your CSV is over %s and is too big to process. Please split the file into two or more sections.')|replace({'%s': maxPostSize}),
 'dataProcessingError': __("Your data could not be processed. Please make sure it is in the correct format."),
-'noValidRecords': __('No valid records were found. This file needs to be formatted in a CSV style (comma-separated.) Look at some [link]examples on our support site.[/link]'),
+'noValidRecords': __('No valid records were found. This file needs to be formatted in a CSV style (comma-separated). Look at some [link]examples on our support site.[/link]'),
 'importNoticeSkipped': __('%1$s records had issues and were skipped.'),
 'importNoticeInvalid': __('%1$s emails are not valid: %2$s'),
 'importNoticeDuplicate': __('%1$s emails appear more than once in your file: %2$s'),

views/subscribers/importExport/import/step1.html

@@ -108,9 +108,9 @@
         <tbody>
         <tr>
           <th scope="row">
-            <%= ('Did these subscribers ask to be in your list?') %>
+            <%= __('Did these subscribers ask to be in your list?') %>
             <p class="description">
-              <%= ('If the answer is "no", consider yourself a spammer.') %>
+              <%= __('If the answer is "no", consider yourself a spammer.') %>
               <br/>
               <%=
               __('[link]Read more at our Knowledge Base[/link]')
@@ -126,7 +126,7 @@
         <tr>
           <th scope="row">
             <a href="javascript:;"
-             class="button-primary button-disabled wysija mailpoet_process"><%= ('Next step') %> </a>
+             class="button-primary button-disabled wysija mailpoet_process"><%= __('Next step') %> </a>
           </th>
         </tr>
         </tbody>

views/subscribers/importExport/import/step2.html

@@ -134,7 +134,7 @@
         <input id="new_segment_name" type="text" name="name"/>
       </p>
       <p class="mailpoet_validation_error" data-error="segment_name_required">
-        <%= __('Please specify a name') %>
+        <%= __('Please specify a name.') %>
       </p>
       <p class="mailpoet_validation_error" data-error="segment_name_not_unique">
         <%= __('Another record already exists. Please specify a different "%1$s".')|format('name') %>

views/welcome.html

@@ -65,7 +65,7 @@
     <p><%= __("About once a month, we send out a pretty cool newsletter ourselves.") %></p>
     <p><%= __("Sign up to get: Tips and tricks, special offers and important plugin updates!") %></p>
     <p>
-    <iframe width="380" scrolling="no" frameborder="0" src="http://www.mailpoet.com/?wysija-page=1&controller=subscribers&action=wysija_outter&wysija_form=5&external_site=1&wysijap=subscriptions-3" class="iframe-wysija" vspace="0" tabindex="0" style="border-style: none; display:block; visibility: visible; background-color: #f1f1f1!important;" marginwidth="0" marginheight="0" hspace="0" allowtransparency="true" title="Subscribe To Our Newsletter"></iframe>
+    <iframe width="380" scrolling="no" frameborder="0" src="http://www.mailpoet.com/?wysija-page=1&controller=subscribers&action=wysija_outter&wysija_form=5&external_site=1&wysijap=subscriptions-3" class="iframe-wysija" vspace="0" tabindex="0" style="border-style: none; display:block; visibility: visible; background-color: #f1f1f1!important;" marginwidth="0" marginheight="0" hspace="0" allowtransparency="true" title="<%= __("Subscribe To Our Newsletter") %>"></iframe>
     </p>
   </div>