[xoops-svn] SF.net SVN: xoops-svn:[12438] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter/language/english

[<luc...@us...>]

Revision: 12438
          http://sourceforge.net/p/xoops/svn/12438
Author:   luciorota
Date:     2014-04-08 21:34:47 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
Christelle corrections, thanks

Modified Paths:
--------------
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/admin.php
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/admin.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/admin.php	2014-04-08 21:31:01 UTC (rev 12437)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/admin.php	2014-04-08 21:34:47 UTC (rev 12438)
@@ -34,7 +34,7 @@
 define('_AM_XNEWSLETTER_FORMIMAGE_PATH',"File presents in %s");
 define('_AM_XNEWSLETTER_FORMACTION',"Action");
 define('_AM_XNEWSLETTER_ERROR_NO_VALID_ID',"Error: no valid id!");
-define('_AM_XNEWSLETTER_OK',"Succesful");
+define('_AM_XNEWSLETTER_OK',"Successful");
 define('_AM_XNEWSLETTER_FAILED',"failed");
 define('_AM_XNEWSLETTER_SAVE',"Save");
 define('_AM_XNEWSLETTER_DETAILS',"Show details");
@@ -151,7 +151,7 @@
 define('_AM_XNEWSLETTER_ACCOUNTS_PORT_OUT',"Port out");
 define('_AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_OUT',"Securetype out");
 define('_AM_XNEWSLETTER_ACCOUNTS_DEFAULT',"Default account");
-define('_AM_XNEWSLETTER_ACCOUNTS_BOUNCE_INFO',"Addtional info for Bounced emails handling");
+define('_AM_XNEWSLETTER_ACCOUNTS_BOUNCE_INFO',"Additional info for Bounced emails handling");
 define('_AM_XNEWSLETTER_ACCOUNTS_USE_BMH',"Use Bounced emails handling");
 define('_AM_XNEWSLETTER_ACCOUNTS_INBOX',"Mailbox to check for Bounced emails");
 define('_AM_XNEWSLETTER_ACCOUNTS_HARDBOX',"Use this mailbox as 'hard box'");

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html	2014-04-08 21:31:01 UTC (rev 12437)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html	2014-04-08 21:34:47 UTC (rev 12438)
@@ -47,7 +47,7 @@
         - Sending newsletters to unlimited number of recipients or in packages with certain number of recipients by using cronjob<br />
         - Bounced email handler for handling Bounced emails in case of invalid e-mail-addresses<br />
         - Optionally synchronisation with mailing lists (e.g. majordomo)<br />
-        - Maintenace function included<br />
+        - Maintenance function included<br />
         - Creating protocol for the important steps<br />
         <br />
     </p>
@@ -68,7 +68,7 @@
 
     <h5 class="odd">(Un) subscriptions to newsletters</h5>
     <p class="even">
-    You can define for each newsletter and for each group, whether for (un) subscritpion or change a confirmation email with activation key is necessary or not (use double-option).<br />
+    You can define for each newsletter and for each group, whether for (un) subscription or change a confirmation email with activation key is necessary or not (use double-option).<br />
     <br /><br /></p>
 
     <h5 class="odd">Accounts</h5>
@@ -112,7 +112,7 @@
     You can restart sending procedure. You can send it again to all subscribers or send it only to the subscribers, where sending procedure failed).<br />
     <br />
     You can send all emails immediately or limit emails send in one package.<br />
-    The number of emails and the minutes untill next sending can be defined in module preferences (e.g. 200 emails all 60 minutes).<br />
+    The number of emails and the minutes until next sending can be defined in module preferences (e.g. 200 emails all 60 minutes).<br />
     The first package will be sent immediately. To start the next sending procedure you need an external cronjob, which is calling "../modules/xNewsletter/cron.php". Xoops cannot do this with current version (2.5.5).<br />
     <br />
     Pay attention: functions like testing account, sending emails, start Bounced email handler,... work not with local server (you get white page).<br />

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php	2014-04-08 21:31:01 UTC (rev 12437)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php	2014-04-08 21:34:47 UTC (rev 12438)
@@ -28,7 +28,7 @@
 // Main
 define('_MA_XNEWSLETTER_INDEX',"Home");
 define('_MA_XNEWSLETTER_TITLE',"xNewsletter");
-define('_MA_XNEWSLETTER_DESC',"Newsletter module for xoops");
+define('_MA_XNEWSLETTER_DESC',"Newsletter module for Xoops");
 define('_MA_XNEWSLETTER_WELCOME',"<h2>Welcome in our newsletter system</h2>We hope, we can keep you up to date with our newsletters. Feel free to subscribe to one or more of our newsletters. If you do not want a newsletter any more, than you can easily unsubscribe here. You also can unsubscribe in a simple way via a link in each of our newsletters.");
 define('_MA_XNEWSLETTER_ACCOUNTS',"Accounts");
 define('_MA_XNEWSLETTER_CAT',"Category");
@@ -46,7 +46,7 @@
 define('_MA_XNEWSLETTER_SUBSCRIPTION_EXIST_NONE',"No subscriptions existing");
 define('_MA_XNEWSLETTER_REGISTRATION_EXIST',"Existing registrations of this email");
 define('_MA_XNEWSLETTER_REGISTRATION_NONE',"Your email isn't registered till now. For subscriptions we need further information. Please fill in registration form.<br />We want to inform you, that your ip-address will be saved for the purpose of transparency.");
-define('_MA_XNEWSLETTER_REGISTRATION_ADD',"If you want, you can add more than one person to one email, and later on you can make different suscriptions");
+define('_MA_XNEWSLETTER_REGISTRATION_ADD',"If you want, you can add more than one person to one email, and later on you can make different subscriptions");
 define('_MA_XNEWSLETTER_SUBSCRIPTION_ADD',"Add a new subscription");
 define('_MA_XNEWSLETTER_SUBSCRIPTION_EDIT',"Edit subscriptions");
 define('_MA_XNEWSLETTER_SUBSCRIPTION_DELETE',"Delete subscriptions");
@@ -71,8 +71,8 @@
 define('_MA_XNEWSLETTER_SUBSCRIPTION_PROT_NO_CHANGE',"No changes in selection newsletter '%nl'");
 define('_MA_XNEWSLETTER_SUBSCRIPTION_PROT_DAT_QUITED_REMOVED',"Date quit from newsletter '%nl' successful removed");
 define('_MA_XNEWSLETTER_SUBSCRIPTION_PROT_SENT_INFO',"Information mail sent to '%e'");
-define('_MA_XNEWSLETTER_SUBSCRIPTION_QUITED',"<span style='color:red'>Attention: quited by the webmaster!</span>");
-define('_MA_XNEWSLETTER_SUBSCRIPTION_QUITED_DETAIL',"<span style='color:red'>Attention: This subscription has been quited by the webmaster at %q as a result of bounced emails! If you want to reactivate the subscription, please let this newsletter checked.</span>");
+define('_MA_XNEWSLETTER_SUBSCRIPTION_QUITED',"<span style='color:red'>Attention: deactivated by the webmaster!</span>");
+define('_MA_XNEWSLETTER_SUBSCRIPTION_QUITED_DETAIL',"<span style='color:red'>Attention: This subscription has been deactivated by the webmaster at %q as a result of bounced emails! If you want to reactivate the subscription, please let this newsletter checked.</span>");
 define('_MA_XNEWSLETTER_UNSUBSCRIPTION_OK',"The email '%e' have been successfully unsubscribed from newsletter '%n'");
 define('_MA_XNEWSLETTER_UNSUBSCRIPTION_ERROR',"Error while unsubscribe '%e' from newsletter '%n'");
 define('_MA_XNEWSLETTER_SUBSCRIPTION_UPDATE_OK',"Your Newsletter has changed");

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php	2014-04-08 21:31:01 UTC (rev 12437)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php	2014-04-08 21:34:47 UTC (rev 12438)
@@ -27,7 +27,7 @@
  */
 // Admin
 define('_MI_XNEWSLETTER_NAME',"xNewsletter");
-define('_MI_XNEWSLETTER_DESC',"Newsletter module for xoops");
+define('_MI_XNEWSLETTER_DESC',"Newsletter module for Xoops");
 //Menu
 define('_MI_XNEWSLETTER_ADMENU1',"Dashboard");
 define('_MI_XNEWSLETTER_ADMENU2',"Accounts");
@@ -57,7 +57,7 @@
 define('_MI_XNEWSLETTER_EDITOR',"Editor");
 define('_MI_XNEWSLETTER_KEYWORDS',"Keywords");
 define('_MI_XNEWSLETTER_KEYWORDS_DESC',"Insert here the keywords (separate by comma)");
-define('_MI_XNEWSLETTER_ADMINPERPAGE',"Number of list entries in admin pages");
+define('_MI_XNEWSLETTER_ADMINPERPAGE',"Number of list entries in administration pages");
 define('_MI_XNEWSLETTER_ADMINPERPAGE_DESC',"Specifies how many items you want to display per page in the list.");
 define('_MI_XNEWSLETTER_ADVERTISE',"Code of advertise");
 define('_MI_XNEWSLETTER_ADVERTISE_DESC',"Insert here the code of advertisement");
@@ -65,7 +65,7 @@
 define('_MI_XNEWSLETTER_SOCIALACTIVE_DESC',"If you want to see the buttons of social networks, click on Yes");
 define('_MI_XNEWSLETTER_SOCIALCODE',"Code of social networks");
 define('_MI_XNEWSLETTER_SOCIALCODE_DESC',"Insert here the code of social networks");
-define('_MI_XNEWSLETTER_ATTACHMENT_MAXSIZE',"Max file size");
+define('_MI_XNEWSLETTER_ATTACHMENT_MAXSIZE',"Maximum file size");
 define('_MI_XNEWSLETTER_ATTACHMENT_MAXSIZE_DESC',"Maximum file size for attachments");
 define('_MI_XNEWSLETTER_ATTACHMENT_MIMETYPES',"Mime-types");
 define('_MI_XNEWSLETTER_ATTACHMENT_MIMETYPES_DESC',"Allowed mime-types for attachments");
@@ -80,13 +80,14 @@
 define('_MI_XNEWSLETTER_USE_SALUTATION',"Use field salutation");
 define('_MI_XNEWSLETTER_USE_SALUTATION_DESC',"Please decide, whether you want use salutations like 'Mr.', 'Mrs.',...");
 define('_MI_XNEWSLETTER_SEND_IN_PACKAGES',"Send e-mails in packages");
-define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_DESC',"Number of e-mails, which should be sent in one package. 0 means, that all e-mails always be sent immediatly. You can use this option only, if you can start cronjobs with external programs.");
+define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_DESC',"Number of e-mails, which should be sent in one package. 0 means, that all e-mails always be sent immediately. You can use this option only, if you can start cronjobs with external programs.");
 define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME',"Time period for sending e-mails in packages");
 define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME_DESC',"Time period in minutes, when the next package should be sent. Only used, if 'Send e-mails in packages' is bigger than 0.");
 define('_MI_XNEWSLETTER_UPGRADEFAILED',"Error while updating module");
 // version 1.2
 define('_MI_XNEWSLETTER_SUBSCRINFO_BLOCK',"Info Newsletter");
 define('_MI_XNEWSLETTER_SUBSCRINFO_TEXT_BLOCK',"If you want to be informed in time, then subscribe to our newsletter");
+// version 1.3
 define('_MI_XNEWSLETTER_WELCOME_MESSAGE',"Welcome message");
 define('_MI_XNEWSLETTER_WELCOME_MESSAGE_DESC',"Html format");
 define('_MI_XNEWSLETTER_WELCOME',"<h2>Welcome in our newsletter system</h2>We hope, we can keep you up to date with our newsletters. Feel free to subscribe to one or more of our newsletters. If you do not want a newsletter any more, than you can easily unsubscribe here. You also can unsubscribe in a simple way via a link in each of our newsletters.");