Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12186] XoopsModules/xnewsletter/trunk/xNewsletter/ language/english
|
From: <ce...@us...> - 2013-10-20 14:22:45
|
Revision: 12186
http://sourceforge.net/p/xoops/svn/12186
Author: cesag
Date: 2013-10-20 14:22:43 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Fixed typos in the English language files (cesag)
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php 2013-10-20 12:27:39 UTC (rev 12185)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php 2013-10-20 14:22:43 UTC (rev 12186)
@@ -82,8 +82,8 @@
define('_AM_XNEWSLETTER_SEND_SUCCESS', "Newsletter sent");
define('_AM_XNEWSLETTER_SEND_SUCCESS_TEST', "Newsletter sent for test");
define('_AM_XNEWSLETTER_SEND_SUCCESS_NUMBER', "Sending %t newsletter(s) successfully");
-define('_AM_XNEWSLETTER_SEND_SUCCESS_ML', "Handle mailinglist successfully");
-define('_AM_XNEWSLETTER_SEND_SUCCESS_ML_DETAIL', "Sending '%a' to mailinglist successfully");
+define('_AM_XNEWSLETTER_SEND_SUCCESS_ML', "Handle mailing list successfully");
+define('_AM_XNEWSLETTER_SEND_SUCCESS_ML_DETAIL', "Sending '%a' to mailing list successfully");
define('_AM_XNEWSLETTER_SEND_ERROR_NUMBER', "Error sending newsletter: %e of %t newsletters not sent");
define('_AM_XNEWSLETTER_SEND_ERROR_PHPMAILER', "Error phpmailer: ");
define('_AM_XNEWSLETTER_SEND_ERROR_NO_EMAIL', "Error: No e-mail-address available");
@@ -129,9 +129,9 @@
define('_AM_XNEWSLETTER_NEWMAILINGLIST', "Add New Mailinglist");
define('_AM_XNEWSLETTER_MAILINGLISTLIST', "List Mailinglist");
define('_AM_XNEWSLETTER_MAILINGLISTWAIT', "Pending Mailinglist");
-define('_AM_XNEWSLETTER_RUNBMH', "Run bounced mail handler");
-define('_AM_XNEWSLETTER_BMHLIST', "List bounced mail handlers");
-define('_AM_XNEWSLETTER_BMHWAIT', "Pending bounced mail handlers");
+define('_AM_XNEWSLETTER_RUNBMH', "Run Bounced email handler");
+define('_AM_XNEWSLETTER_BMHLIST', "List Bounced email handlers");
+define('_AM_XNEWSLETTER_BMHWAIT', "Pending Bounced email handlers");
define('_AM_XNEWSLETTER_ACCOUNTS_ADD', "Add an Account");
define('_AM_XNEWSLETTER_ACCOUNTS_EDIT', "Edit an Account");
define('_AM_XNEWSLETTER_ACCOUNTS_DELETE', "Delete an Account");
@@ -151,32 +151,32 @@
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 mails handling");
-define('_AM_XNEWSLETTER_ACCOUNTS_USE_BMH', "Use bounced mails handling");
-define('_AM_XNEWSLETTER_ACCOUNTS_INBOX', "Mailbox to check for bounced mails");
-define('_AM_XNEWSLETTER_ACCOUNTS_HARDBOX', "Use this mailbox as 'hardbox'");
-define('_AM_XNEWSLETTER_ACCOUNTS_HARDBOX_DESC', "The mailboxname must start with 'INBOX.'. You can select a standard folder in your mailbox (e.g. INBOX.Trash) or create your own special folders like 'hard' and 'soft'. If you type in a new folder name, the folder will be created (this function is not available for gmail-accounts).");
-define('_AM_XNEWSLETTER_ACCOUNTS_MOVEHARD', "Move bounced mail in 'hardbox'");
-define('_AM_XNEWSLETTER_ACCOUNTS_SOFTBOX', "Use this mailbox as 'softbox'");
-define('_AM_XNEWSLETTER_ACCOUNTS_MOVESOFT', "Move bounced mail in 'softbox'");
+define('_AM_XNEWSLETTER_ACCOUNTS_BOUNCE_INFO', "Addtional 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'");
+define('_AM_XNEWSLETTER_ACCOUNTS_HARDBOX_DESC', "The mailbox name must start with 'INBOX.'. You can select a standard folder in your mailbox (e.g. INBOX.Trash) or create your own special folders like 'hard' and 'soft'. If you type in a new folder name, the folder will be created (this function is not available for gmail-accounts).");
+define('_AM_XNEWSLETTER_ACCOUNTS_MOVEHARD', "Move Bounced email in 'hard box'");
+define('_AM_XNEWSLETTER_ACCOUNTS_SOFTBOX', "Use this mailbox as 'soft box'");
+define('_AM_XNEWSLETTER_ACCOUNTS_MOVESOFT', "Move Bounced email in 'soft box'");
define('_AM_XNEWSLETTER_ACCOUNTS_SUBMITTER', "Submitter");
define('_AM_XNEWSLETTER_ACCOUNTS_CREATED', "Created");
define('_AM_XNEWSLETTER_ACCOUNTS_ERROR_OPEN_MAILBOX', "Error open mailbox! Please check your settings!");
define('_AM_XNEWSLETTER_SAVE_AND_CHECK', "Save and check settings");
-define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_OK', "succesful ");
+define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_OK', "successful ");
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED', "failed ");
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED', "skipped");
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK', "Check result");
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO', "Additional info");
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX', "Open mailbox ");
define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS', "Open folders ");
-define('_AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH', "Bounced mail handler ");
+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_CAT_ADD', "Add a category");
-define('_AM_XNEWSLETTER_CAT_EDIT', "Edit a categories");
-define('_AM_XNEWSLETTER_CAT_DELETE', "Delete a categories");
+define('_AM_XNEWSLETTER_CAT_EDIT', "Edit a category");
+define('_AM_XNEWSLETTER_CAT_DELETE', "Delete a category");
define('_AM_XNEWSLETTER_CAT_ID', "Id");
define('_AM_XNEWSLETTER_CAT_NAME', "Newsletter name");
define('_AM_XNEWSLETTER_CAT_INFO', "Additional info");
@@ -188,15 +188,15 @@
define('_AM_XNEWSLETTER_CAT_GPERMS_LIST', "Permissions to see list of subscribers");
define('_AM_XNEWSLETTER_CAT_SUBMITTER', "Submitter");
define('_AM_XNEWSLETTER_CAT_CREATED', "Created");
-define('_AM_XNEWSLETTER_CAT_MAILINGLIST', "Mailinglist");
+define('_AM_XNEWSLETTER_CAT_MAILINGLIST', "Mailing list");
define('_AM_XNEWSLETTER_SUBSCR_ADD', "Add a Subscriber");
define('_AM_XNEWSLETTER_SUBSCR_EDIT', "Edit a Subscriber");
define('_AM_XNEWSLETTER_SUBSCR_DELETE', "Delete a Subscriber");
define('_AM_XNEWSLETTER_SUBSCR_ID', "Id");
define('_AM_XNEWSLETTER_SUBSCR_EMAIL', "Email");
-define('_AM_XNEWSLETTER_SUBSCR_FIRSTNAME', "Firstname");
-define('_AM_XNEWSLETTER_SUBSCR_LASTNAME', "Lastname");
-define('_AM_XNEWSLETTER_SUBSCR_UID', "Membername");
+define('_AM_XNEWSLETTER_SUBSCR_FIRSTNAME', "First name");
+define('_AM_XNEWSLETTER_SUBSCR_LASTNAME', "Last name");
+define('_AM_XNEWSLETTER_SUBSCR_UID', "Member name");
define('_AM_XNEWSLETTER_SUBSCR_SEX', "Salutation");
define('_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY', "");
define('_AM_XNEWSLETTER_SUBSCR_SEX_MALE', "Mr.");
@@ -207,13 +207,13 @@
define('_AM_XNEWSLETTER_SUBSCR_CREATED', "Created");
define('_AM_XNEWSLETTER_SUBSCR_ACTIVATED', "activated?");
define('_AM_XNEWSLETTER_SUBSCR_SHOW_ALL', "Show all");
-define('_AM_XNEWSLETTER_CATSUBSCR_ADD', "Add a Categories-Subscribers");
-define('_AM_XNEWSLETTER_CATSUBSCR_EDIT', "Edit a Categories-Subscribers");
-define('_AM_XNEWSLETTER_CATSUBSCR_DELETE', "Delete a Categories-Subscribers");
+define('_AM_XNEWSLETTER_CATSUBSCR_ADD', "Add a subscriber to a category");
+define('_AM_XNEWSLETTER_CATSUBSCR_EDIT', "Edit a a subscriber to a category");
+define('_AM_XNEWSLETTER_CATSUBSCR_DELETE', "Delete a subscriber to a category");
define('_AM_XNEWSLETTER_CATSUBSCR_ID', "Id");
-define('_AM_XNEWSLETTER_CATSUBSCR_CATID', "Cat-Id");
+define('_AM_XNEWSLETTER_CATSUBSCR_CATID', "Newsletter");
define('_AM_XNEWSLETTER_CATSUBSCR_SUBSCRID', "Subscribers");
-define('_AM_XNEWSLETTER_CATSUBSCR_QUITED', "Quited");
+define('_AM_XNEWSLETTER_CATSUBSCR_QUITED', "Unsubscribed");
define('_AM_XNEWSLETTER_CATSUBSCR_SUBMITTER', "Submitter");
define('_AM_XNEWSLETTER_CATSUBSCR_CREATED', "Created");
define('_AM_XNEWSLETTER_CATSUBSCR_SUREDELETE', "Do you really want to delete<br />'%s'<br />from<br />'%c' ?");
@@ -264,20 +264,20 @@
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 send to");
+define('_AM_XNEWSLETTER_MAILINGLIST_EMAIL_DESC', "Email, where subscription code should be sending to");
define('_AM_XNEWSLETTER_MAILINGLIST_LISTNAME', "Listname");
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");
define('_AM_XNEWSLETTER_MAILINGLIST_SUBMITTER', "Submitter");
define('_AM_XNEWSLETTER_MAILINGLIST_CREATED', "Created");
-define('_AM_XNEWSLETTER_BOUNCETYPE', "Bouncetype");
-define('_AM_XNEWSLETTER_BMH_EDIT', "Edit a bounced mail handler");
-define('_AM_XNEWSLETTER_BMH_DELETE', "Delete a bounced mail handler");
+define('_AM_XNEWSLETTER_BOUNCETYPE', "Bounce type");
+define('_AM_XNEWSLETTER_BMH_EDIT', "Edit a Bounced email handler");
+define('_AM_XNEWSLETTER_BMH_DELETE', "Delete a Bounced email handler");
define('_AM_XNEWSLETTER_BMH_ID', "Id");
define('_AM_XNEWSLETTER_BMH_RULE_NO', "Rule no");
define('_AM_XNEWSLETTER_BMH_RULE_CAT', "Rule cat");
-define('_AM_XNEWSLETTER_BMH_BOUNCETYPE', "Bouncetype");
+define('_AM_XNEWSLETTER_BMH_BOUNCETYPE', "Bounce type");
define('_AM_XNEWSLETTER_BMH_REMOVE', "Removed");
define('_AM_XNEWSLETTER_BMH_EMAIL', "Email");
define('_AM_XNEWSLETTER_BMH_SUBJECT', "Subject");
@@ -288,22 +288,22 @@
define('_AM_XNEWSLETTER_BMH_MEASURE_NOTHING', "Do nothing");
define('_AM_XNEWSLETTER_BMH_MEASURE_QUIT', "Quit this subscriber temporary");
define('_AM_XNEWSLETTER_BMH_MEASURE_DELETE', "Delete this subscriber");
-define('_AM_XNEWSLETTER_BMH_MEASURE_QUITED', "Subscriber temporary quited");
+define('_AM_XNEWSLETTER_BMH_MEASURE_QUITED', "Subscriber temporary quit");
define('_AM_XNEWSLETTER_BMH_MEASURE_DELETED', "Subscriber deleted");
define('_AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED', "Subscriber already deleted! Action not possible!");
-define('_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE', "Do you really want to delete this registration with all subscriptions?<br /><br />Reactivating by the subscriber will not be posssible later!<br/><br />");
+define('_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE', "Do you really want to delete this registration with all subscriptions?<br /><br />Reactivating by the subscriber will not be possible later!<br/><br />");
define('_AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID', "There is nor existing registration for the this email!");
-define('_AM_XNEWSLETTER_BMH_ERROR_NO_ACTIVE', "Bounced mail handler isn't activated in any account");
+define('_AM_XNEWSLETTER_BMH_ERROR_NO_ACTIVE', "Bounced email handler isn't activated in any account");
define('_AM_XNEWSLETTER_BMH_RSLT', "Result of checking mailbox %b<br/>Messages read: %r<br/>Action taken: %a<br/>No action taken: %n<br/>Moved: %m<br/>Deleted: %d<br/><br/><br/>");
-define('_AM_XNEWSLETTER_BMH_SUCCESSFUL', "Bounced mail handler successfully finished");
+define('_AM_XNEWSLETTER_BMH_SUCCESSFUL', "Bounced email handler successfully finished");
define('_AM_XNEWSLETTER_BMH_MEASURE_ALL', "Show all");
-define('_AM_XNEWSLETTER_BMH_MEASURE_SHOW_NONE', "No bmh items for measure '%s' available");
+define('_AM_XNEWSLETTER_BMH_MEASURE_SHOW_NONE', "No Bounced email items for measure '%s' available");
define('_AM_XNEWSLETTER_MAINTENANCE_CAT', "Category");
define('_AM_XNEWSLETTER_MAINTENANCE_DESCR', "Description");
-define('_AM_XNEWSLETTER_MAINTENANCE_PARAM', "Params");
+define('_AM_XNEWSLETTER_MAINTENANCE_PARAM', "Parameter");
define('_AM_XNEWSLETTER_MAINTENANCE_ERROR', "Error while running maintenance");
-define('_AM_XNEWSLETTER_MAINTENANCE_DELETEDATE', "Delete all registrations without confirmation, where registration was before this date.<br />Attention: there is noe undo possible! Please check date before execution!");
-define('_AM_XNEWSLETTER_MAINTENANCE_DELETEUSER', "Should these <b>%s</b> unconfirmed registrations with date before %s really deleted.<br />Attention: there is noe undo possible!");
+define('_AM_XNEWSLETTER_MAINTENANCE_DELETEDATE', "Delete all registrations without confirmation, where registration was before this date.<br />Attention: there is no undo possible! Please check date before!");
+define('_AM_XNEWSLETTER_MAINTENANCE_DELETEUSER', "Should these <b>%s</b> unconfirmed registrations with date before %s really deleted.<br />Attention: there is no undo possible!");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETEPROTOCOL', "Delete all protocols and reset tables");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETEPROTOK', "Table protocol maintained.");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETENOTHING', "No action necessary.");
@@ -311,43 +311,43 @@
define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR', "Delete subscriptions to newsletter without an existing registration");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_OK', "%s subscriptions have been deleted");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_NODATA', "No invalid data in table catsubsr found");
-define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML', "Compare data from newsletter cats with mailinglists and correct invalid data");
-define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_OK', "%s wrong data in mailinglist have been corrected");
-define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_NODATA', "No invalid data mailinglist found");
+define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML', "Compare data from newsletter cats with mailing lists and correct invalid data");
+define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_OK', "%s wrong data in mailing list have been corrected");
+define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_NODATA', "No invalid data mailing list found");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL', "Compare data from newsletter cats with newsletters and correct invalid data");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_OK', "%s wrong data in newsletters have been corrected");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_NODATA', "No invalid data newsletters found");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_IMPORT', "Delete table import and reset table");
define('_AM_XNEWSLETTER_MAINTENANCE_DELETE_IMPORT_OK', "Table import maintained.");
-define('_AM_XNEWSLETTER_IMPORT_SEARCH', "Search available E-Mail-Addresses for import");
+define('_AM_XNEWSLETTER_IMPORT_SEARCH', "Search available email addresses to import");
define('_AM_XNEWSLETTER_IMPORT_PRESELECT_CAT', "Preselect category");
-define('_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL', "Available plugins");
+define('_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL', "Available plug-ins");
define('_AM_XNEWSLETTER_IMPORT_CONTINUE', "Continue");
define('_AM_XNEWSLETTER_IMPORT_AFTER_READ', "Action after reading the data");
-define('_AM_XNEWSLETTER_IMPORT_READ_CHECK', "Show data for check");
-define('_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT', "Limit E-Mail-Addresses for import");
+define('_AM_XNEWSLETTER_IMPORT_READ_CHECK', "Show data to check");
+define('_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT', "Limit email addresses to import");
define('_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT_PACKAGE', "Limit E-Mail-Addresses per processing step");
define('_AM_XNEWSLETTER_IMPORT_NOLIMIT', "No limit");
define('_AM_XNEWSLETTER_IMPORT_READ_IMPORT', "Import data at once without a check");
define('_AM_XNEWSLETTER_IMPORT_SHOW', "Show %s to %l of %n available E-Mail-Addresses");
define('_AM_XNEWSLETTER_IMPORT_NODATA', "No data found");
-define('_AM_XNEWSLETTER_IMPORT_EMAIL_EXIST', "E-Mail already registered");
+define('_AM_XNEWSLETTER_IMPORT_EMAIL_EXIST', "Email already registered");
define('_AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST', "Subscription already exist");
-define('_AM_XNEWSLETTER_IMPORT_NOIMPORT', "-- no import --");
-define('_AM_XNEWSLETTER_IMPORT_EXEC', "Import E-Mail-Addresses as preselected");
-define('_AM_XNEWSLETTER_IMPORT_RESULT_SKIP', "Import E-Mail-Address %e skipped");
-define('_AM_XNEWSLETTER_IMPORT_RESULT_FAILED', "Import E-Mail-Address %e failed");
+define('_AM_XNEWSLETTER_IMPORT_NOIMPORT', "-- No import --");
+define('_AM_XNEWSLETTER_IMPORT_EXEC', "Import email addresses as preselected");
+define('_AM_XNEWSLETTER_IMPORT_RESULT_SKIP', "Import email addresses %e skipped");
+define('_AM_XNEWSLETTER_IMPORT_RESULT_FAILED', "Import email addresses %e failed");
define('_AM_XNEWSLETTER_IMPORT_RESULT_REG_OK', "Registration successful");
define('_AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK', "Subscription to category successful");
define('_AM_XNEWSLETTER_IMPORT_SKIP_EXISTING', "Skip existing subscriptions");
-define('_AM_XNEWSLETTER_IMPORT_FINISHED', "Processing %p of %t email-addresses successful finished");
+define('_AM_XNEWSLETTER_IMPORT_FINISHED', "Processing %p of %t email addresses successful finished");
define('_AM_XNEWSLETTER_IMPORT_INFO', "Add all users of a group to a newsletter");
define('_AM_XNEWSLETTER_IMPORT_CSV_OPT', "Options for CSV-file");
define('_AM_XNEWSLETTER_IMPORT_CSV_FILE', "CSV-file:");
define('_AM_XNEWSLETTER_IMPORT_CSV_DELIMITER', "Delimiter:");
define('_AM_XNEWSLETTER_IMPORT_CSV_HEADER', "CSV-file with header");
-define('_AM_XNEWSLETTER_IMPORT_CSV', "One column ( email ) or four columns ( email | sex | firstname | lastname )<br />see sample1col.csv and sample4col.csv in /plugins");
-define('_AM_XNEWSLETTER_IMPORT_XOOPSUSER', "Options for import/syncronisation XoopsUsers");
+define('_AM_XNEWSLETTER_IMPORT_CSV', "One column ( email ) or four columns ( email | sex | first name | last name )<br />see sample1col.csv and sample4col.csv in /plug-ins");
+define('_AM_XNEWSLETTER_IMPORT_XOOPSUSER', "Options to import/synchronise XoopsUsers");
define('_AM_XNEWSLETTER_IMPORT_XOOPSUSER_GROUPS', "Select groups");
define('_AM_XNEWSLETTER_NEWTASK', "Add New task");
define('_AM_XNEWSLETTER_TASKLIST', "List task");
@@ -361,14 +361,14 @@
define('_AM_XNEWSLETTER_TASK_STARTTIME', "Starttime");
define('_AM_XNEWSLETTER_TASK_SUBMITTER', "Submitter");
define('_AM_XNEWSLETTER_TASK_CREATED', "Created");
-define('_AM_XNEWSLETTER_TASK_ERROR_CREATE', "Error creating item in tasklist");
+define('_AM_XNEWSLETTER_TASK_ERROR_CREATE', "Error creating item in task list");
define('_AM_XNEWSLETTER_TASK_NO_DATA', "No tasks waiting");
//Error NoFrameworks
-define('_AM_XNEWSLETTER_NOFRAMEWORKS', "Error: You do not use the Frameworks \"admin module\". Please install this Frameworks");
+define('_AM_XNEWSLETTER_NOFRAMEWORKS', "Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
define('_AM_XNEWSLETTER_MAINTAINEDBY', "is maintained by the");
define('_AM_XNEWSLETTER_SEND_ERROR_NO_LETTERCONTENT', "No text available for printing");
-define('_AM_XNEWSLETTER_FORMSEARCH_SUBSCR_EXIST', "Search existing subscription of an e-mail-address");
-define('_AM_XNEWSLETTER_SUBSCR_NO_CATSUBSCR', "For this e-mail-address are no subscription to newsletter cats available");
+define('_AM_XNEWSLETTER_FORMSEARCH_SUBSCR_EXIST', "Search existing subscription of an email address");
+define('_AM_XNEWSLETTER_SUBSCR_NO_CATSUBSCR', "For this email address, no subscription to newsletter categories are available");
//version 1.2
define('_AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN', "Error: required file 'plugins/%p.php' not found!");
define('_AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION', "Error: required function 'xnewsletter_plugin_getdata_%f' doesn't exist!");
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html 2013-10-20 12:27:39 UTC (rev 12185)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html 2013-10-20 14:22:43 UTC (rev 12186)
@@ -43,10 +43,10 @@
- Detailed handling of permissions for subscription procedures<br />
- Newsletter are based on templates<br />
- Detailed handling of permissions for groups and newsletter (subscribe, write, send)<br />
- - Send: send test mail, resend to all subscribers or only to subscrbers, where sending failed<br />
+ - Send: send test mail, resend to all subscribers or only to subscribers, where sending failed<br />
- Sending newsletters to unlimited number of recipients or in packages with certain number of recipients by using cronjob<br />
- - Bounced mail handler for handling bounced mails in case of invalid e-mail-addresses<br />
- - Optionally syncronisation with mailinglists (e.g. majordomo)<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 />
- Creating protocol for the important steps<br />
<br />
@@ -66,17 +66,17 @@
<p class="even">The module is based on PHPMailer and PHPMailer-BMH
<br /><br /></p>
- <h5 class="odd">(Un)subscriptions to newsletters</h5>
+ <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 aktivation key is necessary or not (use double-optin).<br/>
+ 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/>
<br /><br /></p>
<h5 class="odd">Accounts</h5>
<p class="even">
- You can use one ore more email-account; sending with php mail, php sendmail, smtp is possible.<br/>
+ You can use one or more email-account; sending with php mail, php sendmail, smtp is possible.<br/>
There is a feature for testing pop3 and imap accounts.<br/>
<br />
- Pay attention: functions like testing account, sending mails, start bounced mail handler,... work not with local server (you get white page without any error).<br/>
+ Pay attention: functions like testing account, sending emails, start Bounced email handler,... work not with local server (you get white page without any error).<br/>
<br /><br /></p>
<h5 class="odd">Newsletter categories</h5>
@@ -87,12 +87,12 @@
<h5 class="odd">Create a newsletter</h5>
<p class="even">
- The newsletter can be created with each texteditorm which is installed in current xoops core (e.g. TinyMCE). <br/>
+ The newsletter can be created with each text editor which is installed in current xoops core (e.g. TinyMCE). <br/>
For each newsletter you can use different templates (see also 'Newsletter templates').<br/>
You can define one or more newsletter categories for your newsletter.<br/>
- You can add 5 files maximun as attachment to each newsletter.<br/><br/>
+ You can add 5 files maximum as attachment to each newsletter.<br/><br/>
Optionally you can also copy an older newsletter and edit or send it as a new one.<br/><br/>
- The type of texteditor, allowes mime-types and size of mail attachments can be set in module preferences.<br/>
+ The type of text editor, allows mime-types and size of mail attachments can be set in module preferences.<br/>
<br /><br /></p>
<h5 class="odd">Newsletter templates</h5>
@@ -111,11 +111,11 @@
If one or more send failed, you can see it in the protocol.<br/>
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 immediatly or limit emails send in one package.<br/>
- The number of emails and the minutes till next sending can be defined in module preferences (e.g. 200 emails all 60 minutes).<br/>
- The first package will be sent immediatly. To start the next sending procedure you need an external cronjob, which is calling "../modules/xNewsletter/cron.php". Xoops can not do this with current version (2.5.5).<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 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 mails, start bounced mail handler,... work not with local server (you get white page).<br/>
+ Pay attention: functions like testing account, sending emails, start Bounced email handler,... work not with local server (you get white page).<br/>
<br /><br /></p>
<h5 class="odd">Task list</h5>
@@ -125,49 +125,49 @@
Normally the tab "Task list" is hidden, if this option is disabled.<br/>
<br /><br /></p>
- <h5 class="odd">Handle mailinglists</h5>
+ <h5 class="odd">Handle mailing lists</h5>
<p class="even">
- If you have an existing mailinglist, you can syncronize the (un)subscriptions of one newsletter category with one mailing list.<br/>
- I use majordomo beside this newsletter module, because then I can also send an email form my email-client to the newsletter recipients.<br/>
- One of the disadvantages of mailinglists is, that, if one person is registered in two or more mailinglists and you send a one newsletter to all mailinglists, this person gets the same newsletter more than one time. With xNewsletter he gets only one newsletter.<br />
+ If you have an existing mailing list, you can synchronize the (un) subscriptions of one newsletter category with one mailing list.<br/>
+ I use majordomo beside this newsletter module because then I can also send an email from my email-client to the newsletter recipients.<br/>
+ One of the disadvantages of mailing lists is, that, if one person is registered in two or more mailing lists and you send a one newsletter to all mailing lists, this person gets the same newsletter more than one time. With xNewsletter he gets only one newsletter.<br />
<br />
- <br />Normally the tab "Mailinglist" is hidden, if this option is disabled.<br />
+ <br />Normally the tab "Mailing list" is hidden, if this option is disabled.<br />
<br />
- <b>xNewsletter can not create mailing lists</b>.
+ <b>xNewsletter cannot create mailing lists</b>.
<br /><br /></p>
- <h5 class="odd">Bounced mail handler (BMH)</h5>
+ <h5 class="odd">Bounced email handler (BMH)</h5>
<p class="even">
- If you send newsletters, there will always be some mails not delivered to recipient (bounced mail), because email is no more valid, mailbox is full, and so on.<br/>
- To handle this event and to react on this you can use BMH.<br/>
- You can acitvate BMH for each account.<br/>
- Mails, which are detected as bounced mails by BMH, can be deleted or moved in a special folder, you have to define.<br/>
- Possible actions for bounced mails:<br/>
+ If you send newsletters, there will always be some emails not delivered to recipient (Bounced email), because email is no more valid, mailbox is full, and so on.<br/>
+ To handle this event and to react on this, you can use BMH.<br/>
+ You can activate BMH for each account.<br/>
+ Mails, which are detected as Bounced emails by BMH, can be deleted or moved in a special folder, you have to define.<br/>
+ Possible actions for Bounced emails:<br/>
-- no action (only store)<br/>
- -- quit temporary the subsriptions of this email-address<br/>
- -- delete the subsriptions of this email-address<br/>
+ -- quit temporary the subscriptions of this email-address<br/>
+ -- delete the subscriptions of this email-address<br/>
<br/>
<br />
- <h6 class="odd">Types of bounced mails</h6>
+ <h6 class="odd">Types of Bounced emails</h6>
<u>bounce type hard:</u>
This means that there is a permanent error when sending a mail, e.g. unknown recipient, unknown domain, and so on.<br/>
- This mails will be deleted after detection, so it is recommended to use the movehard-option (the mail will be only moved in this folder, you can check this mail later, if you want).<br/>
+ This mails will be deleted after detection, so it is recommended using the move hard option (the email will be only moved in this folder, you can check this mail later, if you want).<br/>
<br />
<u>bounce type soft:</u><br/>
This means that there is a temporary problem with sending a mail, e.g. mailbox full, server not available, and so on.<br/>
- This mails will not be deleted after detection, but it is recommended to use the movesoft-option in order to keep your basic inbox clean.<br/>
+ This mails will not be deleted after detection, but it is recommended using the move soft option in order to keep your basic in box clean.<br/>
<br />
- Pay attention: functions like testing account, sending mails, start bounced mail handler,... work not with local server (you get white page).<br/>
+ Pay attention: functions like testing account, sending emails, start Bounced email handler,... work not with local server (you get white page).<br/>
<br /><br /></p>
<h5 class="odd">Maintenance</h5>
<p class="even">
- This module have a maintain function, which can repair several faults in the data.<br />
+ This module has a maintain function, which can repair several faults in the data.<br />
<br /><br /></p>
<h5 class="odd">Import</h5>
<p class="even">
- You can import data with various plugins:
+ You can import data with various plug-ins:
<ul>
<li>csv</li>
<li>module rmbulletin</li>
@@ -177,25 +177,25 @@
<li>module subscribers</li>
<li>users from xoops users</li>
<ul>
- The importtool works in this way:<br/>
+ The import tool works in this way:<br/>
- Adding email to the list of subscribers<br/>
- Subscribe this email to one newsletter cat<br/>
- Before you run import tool, therefore please create first minimum one newsletter cat, otherwise the email cannot be subscribed to a cat and the import fails.<br/>
+ Before you run import tool therefore, please create first minimum one newsletter cat, otherwise the email cannot be subscribed to a cat and the import fails.<br/>
You have the possibility<br/>
- - to import the E-Mail-Addresses without any check (recommended for big import datasets) or<br/>
+ - to import the E-Mail-Addresses without any check (recommended for big import data sets) or<br/>
- after reading data you can decide for each email<br/>
- -- whether you want make a subscription or not<br/>
+ -- whether you want to make a subscription or not<br/>
-- to which newsletter you want to make the subscription<br/>
If an email is already registered, import of this email should be skipped (default action, do not touch existing registrations).
<br />
Sample files (sample1col.csv, sample4col.csv) for csv-import you can find in ../xNewsletter/plugins/
<br /><br />
- <b>Attention:</b>In case of registrations/subscription with this import tool there will not be sent an e-mail-notification to the e-mail-owner.<br />
+ <b>Attention:</b>In case of registrations/subscription with this import tool there will not be sent an email notification to the email owner.<br />
<br /><br />
<b>Importation of big email lists:</b><br />
To avoid cache overflow during importation, there are two limits:<br />
- - first limit: only 100000 lines (e.g. of a csv-file) can be stored in temporary importtable<br />
- - second limit: you can finally import data from temporary importtable in packages of max. 25000<br />
+ - first limit: only 100000 lines (e.g. of a csv-file) can be stored in temporary import table<br />
+ - second limit: you can finally import data from temporary import table in packages of max. 25000<br />
<br />
For import of more than 100k emails following procedure can be done:<br />
- run first import email 1 to 100000
@@ -203,9 +203,9 @@
- run second import emails 100001 to 200000 (select option "skip existing subscriptions")
- import finally in packages of 25k
and so on.<br />
- If filesize is not too big for upload, you can repeat as often you want.<br />
+ If file size is not too big to upload, you can repeat as often you want.<br />
<br /><br />
- If you get somewhere a white page, it is no problem, because if option "skip existing subscriptions" is selected the import procedure restart at the first not imported email-address.<br />
+ If you get somewhere a white page, it is no problem because if option "skip existing subscriptions" is selected the import procedure restart at the first not imported email-address.<br />
Reduce number of importing emails or package size and try again.<br />
<br /><br /></p>
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php 2013-10-20 12:27:39 UTC (rev 12185)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php 2013-10-20 14:22:43 UTC (rev 12186)
@@ -28,15 +28,15 @@
// 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', "Cat");
-define('_MA_XNEWSLETTER_SUBSCR', "Subscr");
-define('_MA_XNEWSLETTER_CATSUBSCR', "Catsubscr");
+define('_MA_XNEWSLETTER_CAT', "Category");
+define('_MA_XNEWSLETTER_SUBSCR', "Subscribers");
+define('_MA_XNEWSLETTER_CATSUBSCR', "Subscriber Newsletter category");
define('_MA_XNEWSLETTER_LETTER', "Letter");
define('_MA_XNEWSLETTER_PROTOCOL', "Protocol");
-define('_MA_XNEWSLETTER_BMH', "Bounced mail handler");
+define('_MA_XNEWSLETTER_BMH', "Bounced email handler");
define('_MA_XNEWSLETTER_ADMIN', "Admin");
define('_MA_XNEWSLETTER_LETTER_CATS', "Sent with newsletter");
define('_MA_XNEWSLETTER_SUBSCRIPTION_SEARCH', "Search for subscriptions");
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2013-10-20 12:27:39 UTC (rev 12185)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2013-10-20 14:22:43 UTC (rev 12186)
@@ -38,7 +38,7 @@
define('_MI_XNEWSLETTER_ADMENU7', "Attachments");
define('_MI_XNEWSLETTER_ADMENU8', "Protocols");
define('_MI_XNEWSLETTER_ADMENU9', "Mailinglists");
-define('_MI_XNEWSLETTER_ADMENU10', "Bounced mail handler");
+define('_MI_XNEWSLETTER_ADMENU10', "Bounced email handler");
define('_MI_XNEWSLETTER_ADMENU11', "Maintenance");
define('_MI_XNEWSLETTER_ADMENU12', "Import");
define('_MI_XNEWSLETTER_ADMENU13', "Task list");
|
