|
From: <luc...@us...> - 2014-01-23 21:02:32
|
Revision: 12275
http://sourceforge.net/p/xoops/svn/12275
Author: luciorota
Date: 2014-01-23 21:02:28 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
english corrections
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/admin.php
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-01-23 17:53:45 UTC (rev 12274)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/admin.php 2014-01-23 21:02:28 UTC (rev 12275)
@@ -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");
@@ -50,7 +50,7 @@
define('_AM_ACCOUNTS_TYPE_NAME',"My account name");
define('_AM_ACCOUNTS_TYPE_YOURNAME',"John Doe");
define('_AM_ACCOUNTS_TYPE_YOUREMAIL',"na...@yo...");
-define('_AM_ACCOUNTS_TYPE_USERNAME',"username");
+define('_AM_ACCOUNTS_TYPE_USERNAME',"user name");
define('_AM_ACCOUNTS_TYPE_PWD',"password");
define('_AM_ACCOUNTS_TYPE_POP3_SERVER_IN',"pop3.yourdomain.com");
define('_AM_ACCOUNTS_TYPE_POP3_PORT_IN',"110");
@@ -100,7 +100,7 @@
define('_AM_XNEWSLETTER_THEREARE_LETTER',"There are <span class='bold'>%s</span> Newsletter in the Database");
define('_AM_XNEWSLETTER_THEREARE_PROTOCOL',"There are <span class='bold'>%s</span> Protocol in the Database");
define('_AM_XNEWSLETTER_THEREARE_ATTACHMENT',"There are <span class='bold'>%s</span> Attachment in the Database");
-define('_AM_XNEWSLETTER_THEREARE_MAILINGLIST',"There are <span class='bold'>%s</span> Mailinglist in the Database");
+define('_AM_XNEWSLETTER_THEREARE_MAILINGLIST',"There are <span class='bold'>%s</span> Mailing list in the Database");
define('_AM_XNEWSLETTER_THEREARE_BMH',"There are <span class='bold'>%s</span> Bounce Mails in the Database");
define('_AM_XNEWSLETTER_THEREARE_TASK',"There are <span class='bold'>%s</span> Task in the Database");
//Buttons
@@ -126,9 +126,9 @@
define('_AM_XNEWSLETTER_NEWATTACHMENT',"Add New Attachment");
define('_AM_XNEWSLETTER_ATTACHMENTLIST',"List Attachment");
define('_AM_XNEWSLETTER_ATTACHMENTWAIT',"Pending Attachment");
-define('_AM_XNEWSLETTER_NEWMAILINGLIST',"Add New Mailinglist");
-define('_AM_XNEWSLETTER_MAILINGLISTLIST',"List Mailinglist");
-define('_AM_XNEWSLETTER_MAILINGLISTWAIT',"Pending Mailinglist");
+define('_AM_XNEWSLETTER_NEWMAILINGLIST',"Add New Mailing list");
+define('_AM_XNEWSLETTER_MAILINGLISTLIST',"List Mailing list");
+define('_AM_XNEWSLETTER_MAILINGLISTWAIT',"Pending Mailing list");
define('_AM_XNEWSLETTER_RUNBMH',"Run Bounced email handler");
define('_AM_XNEWSLETTER_BMHLIST',"List Bounced email handlers");
define('_AM_XNEWSLETTER_BMHWAIT',"Pending Bounced email handlers");
@@ -140,18 +140,18 @@
define('_AM_XNEWSLETTER_ACCOUNTS_NAME',"Name");
define('_AM_XNEWSLETTER_ACCOUNTS_YOURNAME',"Your name");
define('_AM_XNEWSLETTER_ACCOUNTS_YOURMAIL',"Your mail");
-define('_AM_XNEWSLETTER_ACCOUNTS_USERNAME',"Username");
+define('_AM_XNEWSLETTER_ACCOUNTS_USERNAME',"User name");
define('_AM_XNEWSLETTER_ACCOUNTS_PASSWORD',"Password");
define('_AM_XNEWSLETTER_ACCOUNTS_INCOMING',"Incoming");
define('_AM_XNEWSLETTER_ACCOUNTS_SERVER_IN',"Server incoming");
define('_AM_XNEWSLETTER_ACCOUNTS_PORT_IN',"Port in");
-define('_AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_IN',"Securetype in");
+define('_AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_IN',"Secure type in");
define('_AM_XNEWSLETTER_ACCOUNTS_OUTGOING',"Outgoing");
define('_AM_XNEWSLETTER_ACCOUNTS_SERVER_OUT',"Server outgoing");
define('_AM_XNEWSLETTER_ACCOUNTS_PORT_OUT',"Port out");
-define('_AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_OUT',"Securetype out");
+define('_AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_OUT',"Secure type 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'");
@@ -172,8 +172,8 @@
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS',"Open folders ");
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH',"Bounced email handler ");
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_INBOX',"Mailbox");
-define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX',"Hardbox");
-define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX',"Softbox");
+define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX',"Hard box");
+define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX',"Soft box");
define('_AM_XNEWSLETTER_CAT_ADD',"Add a category");
define('_AM_XNEWSLETTER_CAT_EDIT',"Edit a category");
define('_AM_XNEWSLETTER_CAT_DELETE',"Delete a category");
@@ -258,14 +258,14 @@
define('_AM_XNEWSLETTER_PROTOCOL_LAST_STATUS',"Last status");
define('_AM_XNEWSLETTER_PROTOCOL_MISC',"Misc protocol items");
define('_AM_XNEWSLETTER_PROTOCOL_NO_SUBSCREMAIL',"No email of recipient found");
-define('_AM_XNEWSLETTER_MAILINGLIST_ADD',"Add a Mailinglist");
-define('_AM_XNEWSLETTER_MAILINGLIST_EDIT',"Edit a Mailinglist");
-define('_AM_XNEWSLETTER_MAILINGLIST_DELETE',"Delete a Mailinglist");
+define('_AM_XNEWSLETTER_MAILINGLIST_ADD',"Add a Mailing list");
+define('_AM_XNEWSLETTER_MAILINGLIST_EDIT',"Edit a Mailing list");
+define('_AM_XNEWSLETTER_MAILINGLIST_DELETE',"Delete a Mailing list");
define('_AM_XNEWSLETTER_MAILINGLIST_ID',"Id");
define('_AM_XNEWSLETTER_MAILINGLIST_NAME',"Name");
define('_AM_XNEWSLETTER_MAILINGLIST_EMAIL',"Email");
define('_AM_XNEWSLETTER_MAILINGLIST_EMAIL_DESC',"Email, where subscription code should be sending to");
-define('_AM_XNEWSLETTER_MAILINGLIST_LISTNAME',"Listname");
+define('_AM_XNEWSLETTER_MAILINGLIST_LISTNAME', "List name");
define('_AM_XNEWSLETTER_MAILINGLIST_SUBSCRIBE',"Subscribe code");
define('_AM_XNEWSLETTER_MAILINGLIST_SUBSCRIBE_DESC',"{email} will be replaced by the email of the subscriber");
define('_AM_XNEWSLETTER_MAILINGLIST_UNSUBSCRIBE',"Unsubscribe code");
@@ -358,7 +358,7 @@
define('_AM_XNEWSLETTER_TASK_LETTER_ID',"Letter");
define('_AM_XNEWSLETTER_TASK_SUBSCR_ID',"Subscriber");
define('_AM_XNEWSLETTER_TASK_STATUS',"Status");
-define('_AM_XNEWSLETTER_TASK_STARTTIME',"Starttime");
+define('_AM_XNEWSLETTER_TASK_STARTTIME',"Start time");
define('_AM_XNEWSLETTER_TASK_SUBMITTER',"Submitter");
define('_AM_XNEWSLETTER_TASK_CREATED',"Created");
define('_AM_XNEWSLETTER_TASK_ERROR_CREATE',"Error creating item in task list");
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php 2014-01-23 17:53:45 UTC (rev 12274)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php 2014-01-23 21:02:28 UTC (rev 12275)
@@ -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-01-23 17:53:45 UTC (rev 12274)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php 2014-01-23 21:02:28 UTC (rev 12275)
@@ -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");
@@ -37,7 +37,7 @@
define('_MI_XNEWSLETTER_ADMENU6',"Newsletters");
define('_MI_XNEWSLETTER_ADMENU7',"Attachments");
define('_MI_XNEWSLETTER_ADMENU8',"Protocols");
-define('_MI_XNEWSLETTER_ADMENU9',"Mailinglists");
+define('_MI_XNEWSLETTER_ADMENU9',"Mailing lists");
define('_MI_XNEWSLETTER_ADMENU10',"Bounced email handler");
define('_MI_XNEWSLETTER_ADMENU11',"Maintenance");
define('_MI_XNEWSLETTER_ADMENU12',"Import");
@@ -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,15 +80,16 @@
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.");
-define('_MI_XNEWSLETTER_DATEFORMAT', "Timestamp");
-define('_MI_XNEWSLETTER_DATEFORMATDSC', "Default Timestamp for module front end. <br />More info here: <a href='http://www.php.net/manual/en/function.date.php'>http://www.php.net/manual/en/function.date.php</a>");
+define('_MI_XNEWSLETTER_DATEFORMAT',"Timestamp");
+define('_MI_XNEWSLETTER_DATEFORMATDSC',"Default Timestamp for module front end. <br />More info here: <a href='http://www.php.net/manual/en/function.date.php'>http://www.php.net/manual/en/function.date.php</a>");
|