|
From: <ce...@us...> - 2013-10-20 12:27:42
|
Revision: 12185
http://sourceforge.net/p/xoops/svn/12185
Author: cesag
Date: 2013-10-20 12:27:39 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Standardization of the English language files and some corrections (cesag).
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/blocks.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/mail_template/activate.tpl
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/mail_template/delete.tpl
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/mail_template/info_change.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/mail_template/update.tpl
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-17 23:40:19 UTC (rev 12184)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php 2013-10-20 12:27:39 UTC (rev 12185)
@@ -1,409 +1,375 @@
-<?php
-/**
- * ****************************************************************************
- * XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2007 - 2012
- * Goffy ( wedega.com )
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting
- * source code which is considered copyrighted (c) material of the
- * original comment or credit authors.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * ---------------------------------------------------------------------------
- * @copyright Goffy ( wedega.com )
- * @license GPL 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : 1 Mon 2012/11/05 14:31:32 : Exp $
- * ****************************************************************************
- */
-
-//General
-define("_AM_XNEWSLETTER_FORMOK","Registered successfull");
-define("_AM_XNEWSLETTER_FORMDELOK","Deleted successfull");
-define("_AM_XNEWSLETTER_FORMDELNOTOK","Error while deleting");
-define("_AM_XNEWSLETTER_FORMSUREDEL", "Are you sure you want to delete: <span class='bold red'>%s</span>");
-define("_AM_XNEWSLETTER_FORMSUREDEL_LIST", "Are you sure you want to delete all protocol items of: <span class='bold red'>%s</span>");
-define("_AM_XNEWSLETTER_FORMSURERENEW", "Are you sure you want renew: <span class='bold red'>%s</span>");
-define("_AM_XNEWSLETTER_FORMUPLOAD","Upload");
-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_FAILED","failed");
-define("_AM_XNEWSLETTER_SAVE","Save");
-define("_AM_XNEWSLETTER_DETAILS","Show details");
-define("_AM_XNEWSLETTER_SEARCH","Search");
-define("_AM_XNEWSLETTER_SEARCH_EQUAL","=");
-define("_AM_XNEWSLETTER_SEARCH_CONTAINS","contains");
-
-define("_AM_ACCOUNTS_TYPE_PHPMAIL","php mail()");
-define("_AM_ACCOUNTS_TYPE_PHPSENDMAIL","php sendmail()");
-define("_AM_ACCOUNTS_TYPE_POP3","pop before smtp");
-define("_AM_ACCOUNTS_TYPE_SMTP","smtp");
-define("_AM_ACCOUNTS_TYPE_GMAIL","gmail");
-
-define("_AM_ACCOUNTS_TYPE_NOTREQUIRED","Not required");
-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_PWD","password");
-define("_AM_ACCOUNTS_TYPE_POP3_SERVER_IN","pop3.yourdomain.com");
-define("_AM_ACCOUNTS_TYPE_POP3_PORT_IN","110");
-define("_AM_ACCOUNTS_TYPE_POP3_SERVER_OUT","mail.yourdomain.com");
-define("_AM_ACCOUNTS_TYPE_POP3_PORT_OUT","25");
-define("_AM_ACCOUNTS_TYPE_SMTP_SERVER_IN","imap.yourdomain.com");
-define("_AM_ACCOUNTS_TYPE_SMTP_PORT_IN","143");
-define("_AM_ACCOUNTS_TYPE_SMTP_SERVER_OUT","mail.yourdomain.com");
-define("_AM_ACCOUNTS_TYPE_SMTP_PORT_OUT","25");
-define("_AM_ACCOUNTS_TYPE_GMAIL_USERNAME","you...@gm...");
-define("_AM_ACCOUNTS_TYPE_GMAIL_SERVER_IN","imap.gmail.com");
-define("_AM_ACCOUNTS_TYPE_GMAIL_PORT_IN","993");
-define("_AM_ACCOUNTS_TYPE_SECURETYPE_IN","tls");
-define("_AM_ACCOUNTS_TYPE_GMAIL_SERVER_OUT","smtp.gmail.com");
-define("_AM_ACCOUNTS_TYPE_GMAIL_PORT_OUT","465");
-define("_AM_ACCOUNTS_TYPE_SECURETYPE_OUT","ssl");
-
-define("_AM_ACCOUNTS_TYPE_CHECK","Check the settings");
-
-define("_AM_XNEWSLETTER_LETTER_ACTION","Action after saving");
-define("_AM_XNEWSLETTER_LETTER_ACTION_SAVED","Saved");
-define("_AM_XNEWSLETTER_LETTER_ACTION_NO","No action");
-define("_AM_XNEWSLETTER_LETTER_ACTION_COPYNEW","Copy and new");
-define("_AM_XNEWSLETTER_LETTER_ACTION_PREVIEW","Show preview");
-define("_AM_XNEWSLETTER_LETTER_ACTION_SEND","Send newsletter to all subscribers");
-define("_AM_XNEWSLETTER_LETTER_ACTION_RESEND","Resend newsletter to subscribers, where sending failed");
-define("_AM_XNEWSLETTER_LETTER_ACTION_SENDTEST","Send newsletter for testing");
-define("_AM_XNEWSLETTER_LETTER_EMAIL_TEST","E-mail for testing newsletter");
-define("_AM_XNEWSLETTER_LETTER_EMAIL_ALTBODY","To view the message, please use an HTML compatible email viewer!");
-define("_AM_XNEWSLETTER_LETTER_ERROR_INVALID_ATT_ID","Error deleting attachment (invalid attachment id)");
-
-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_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");
-define("_AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID","Error: No valid newsletter selected");
-define("_AM_XNEWSLETTER_SEND_ERROR_INALID_TEMPLATE_PATH","Error: template path '%p' not found");
-define("_AM_XNEWSLETTER_SEND_SURE_SENT","This newsletter was already sent to all subscribers.<br/>Do you really want to send this newsletter again to all subscribers?");
-define("_AM_XNEWSLETTER_SEND_ERROR_NO_SUBSCR","Error: No valid subscriptions for the selected newsletter(s) found");
-
-//Index
-define("_AM_XNEWSLETTER_LETTER","Newsletter Statistics");
-define("_AM_XNEWSLETTER_THEREARE_ACCOUNTS","There are <span class='bold'>%s</span> Accounts in the Database");
-define("_AM_XNEWSLETTER_THEREARE_CAT","There are <span class='bold'>%s</span> Categories in the Database");
-define("_AM_XNEWSLETTER_THEREARE_SUBSCR","There are <span class='bold'>%s</span> Subscribers in the Database");
-define("_AM_XNEWSLETTER_THEREARE_CATSUBSCR","There are <span class='bold'>%s</span> Categories-Subscribers in the Database");
-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_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
-define("_AM_XNEWSLETTER_NEWACCOUNTS","Add New Account");
-define("_AM_XNEWSLETTER_ACCOUNTSLIST","List Accounts");
-define("_AM_XNEWSLETTER_ACCOUNTSWAIT","Pending Accounts");
-define("_AM_XNEWSLETTER_NEWCAT","Add New Category");
-define("_AM_XNEWSLETTER_CATLIST","List Categories");
-define("_AM_XNEWSLETTER_CATWAIT","Pending Categories");
-define("_AM_XNEWSLETTER_NEWSUBSCR","Add New Subscriber");
-define("_AM_XNEWSLETTER_SUBSCRLIST","List Subscribers");
-define("_AM_XNEWSLETTER_SUBSCRWAIT","Pending Subscribers");
-define("_AM_XNEWSLETTER_NEWCATSUBSCR","Add New Categories-Subscribers");
-define("_AM_XNEWSLETTER_CATSUBSCRLIST","List Categories-Subscribers");
-define("_AM_XNEWSLETTER_CATSUBSCRWAIT","Pending Categories-Subscribers");
-define("_AM_XNEWSLETTER_NEWLETTER","Add New Newsletter");
-define("_AM_XNEWSLETTER_LETTERLIST","List Newsletters");
-define("_AM_XNEWSLETTER_LETTERWAIT","Pending Newsletters");
-define("_AM_XNEWSLETTER_LETTER_DELETE_ALL","Delete protocol of this newsletter");
-define("_AM_XNEWSLETTER_NEWPROTOCOL","Add New Protocol");
-define("_AM_XNEWSLETTER_PROTOCOLLIST","List Protocol");
-define("_AM_XNEWSLETTER_PROTOCOLWAIT","Pending Protocol");
-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_RUNBMH","Run bounced mail handler");
-define("_AM_XNEWSLETTER_BMHLIST","List bounced mail handlers");
-define("_AM_XNEWSLETTER_BMHWAIT","Pending bounced mail 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");
-define("_AM_XNEWSLETTER_ACCOUNTS_ID","Id");
-define("_AM_XNEWSLETTER_ACCOUNTS_TYPE","Type");
-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_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_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_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_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_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_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_ID","Id");
-define("_AM_XNEWSLETTER_CAT_NAME","Newsletter name");
-define("_AM_XNEWSLETTER_CAT_INFO","Additional info");
-define("_AM_XNEWSLETTER_CAT_GPERMS_CREATE","Permissions to create");
-define("_AM_XNEWSLETTER_CAT_GPERMS_CREATE_DESC","<br/><span style='font-weight:normal'>- Create new newsletters<br/>- Edit, delete, send of own newsletters</span>");
-define("_AM_XNEWSLETTER_CAT_GPERMS_ADMIN","Permission to admin");
-define("_AM_XNEWSLETTER_CAT_GPERMS_ADMIN_DESC","<br/><span style='font-weight:normal'>Edit, delete, send of all newsletters of this category</span>");
-define("_AM_XNEWSLETTER_CAT_GPERMS_READ","Permissions to read/subscribe");
-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_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_SEX","Salutation");
-define("_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY","");
-define("_AM_XNEWSLETTER_SUBSCR_SEX_MALE","Mr.");
-define("_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE","Mrs.");
-define("_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY","Family");
-define("_AM_XNEWSLETTER_SUBSCR_SEX_COMP","Company");
-define("_AM_XNEWSLETTER_SUBSCR_SUBMITTER","Submitter");
-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_ID","Id");
-define("_AM_XNEWSLETTER_CATSUBSCR_CATID","Cat-Id");
-define("_AM_XNEWSLETTER_CATSUBSCR_SUBSCRID","Subscribers");
-define("_AM_XNEWSLETTER_CATSUBSCR_QUITED","Quited");
-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' ?");
-define("_AM_XNEWSLETTER_CATSUBSCR_QUIT_NONE","None");
-define("_AM_XNEWSLETTER_CATSUBSCR_QUIT_NOW","Quit now");
-define("_AM_XNEWSLETTER_CATSUBSCR_QUIT_REMOVE","Remove quit date");
-
-define("_AM_XNEWSLETTER_LETTER_ADD","Add a newsletter");
-define("_AM_XNEWSLETTER_LETTER_EDIT","Edit a newsletter");
-define("_AM_XNEWSLETTER_LETTER_DELETE","Delete a newsletter");
-define("_AM_XNEWSLETTER_LETTER_ID","Id");
-define("_AM_XNEWSLETTER_LETTER_TITLE","Title");
-define("_AM_XNEWSLETTER_LETTER_CONTENT","Content");
-define("_AM_XNEWSLETTER_LETTER_TEMPLATE","Template");
-define("_AM_XNEWSLETTER_LETTER_CATS","Categories");
-define("_AM_XNEWSLETTER_LETTER_ATTACHMENT","Attachments");
-define("_AM_XNEWSLETTER_LETTER_STATUS","Status");
-define("_AM_XNEWSLETTER_LETTER_SUBMITTER","Submitter");
-define("_AM_XNEWSLETTER_LETTER_CREATED","Created");
-define("_AM_XNEWSLETTER_LETTER_ACCOUNTS_AVAIL","Available accounts");
-define("_AM_XNEWSLETTER_LETTER_ACCOUNT","Account");
-define("_AM_XNEWSLETTER_LETTER_MAILINGLIST","Use mailing list");
-define("_AM_XNEWSLETTER_LETTER_MAILINGLIST_NO","None");
-
-define("_AM_XNEWSLETTER_ATTACHMENT_ADD","Add an attachment");
-define("_AM_XNEWSLETTER_ATTACHMENT_EDIT","Edit an attachment");
-define("_AM_XNEWSLETTER_ATTACHMENT_DELETE","Delete an attachment");
-define("_AM_XNEWSLETTER_ATTACHMENT_ID","Id");
-define("_AM_XNEWSLETTER_ATTACHMENT_LETTER_ID","Letter-Id");
-define("_AM_XNEWSLETTER_ATTACHMENT_NAME","Name");
-define("_AM_XNEWSLETTER_ATTACHMENT_TYPE","File type");
-define("_AM_XNEWSLETTER_ATTACHMENT_SUBMITTER","Submitter");
-define("_AM_XNEWSLETTER_ATTACHMENT_CREATED","Created");
-
-define("_AM_XNEWSLETTER_PROTOCOL_ADD","Add a Protocol");
-define("_AM_XNEWSLETTER_PROTOCOL_EDIT","Edit a Protocol");
-define("_AM_XNEWSLETTER_PROTOCOL_DELETE","Delete a Protocol");
-define("_AM_XNEWSLETTER_PROTOCOL_ID","Id");
-define("_AM_XNEWSLETTER_PROTOCOL_LETTER_ID","Newsletter-Id");
-define("_AM_XNEWSLETTER_PROTOCOL_SUBSCRIBER_ID","Subscriber-Id");
-define("_AM_XNEWSLETTER_PROTOCOL_STATUS","Status");
-define("_AM_XNEWSLETTER_PROTOCOL_SUCCESS","Success");
-define("_AM_XNEWSLETTER_PROTOCOL_SUBMITTER","Submitter");
-define("_AM_XNEWSLETTER_PROTOCOL_CREATED","Created");
-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_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_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_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_REMOVE","Removed");
-define("_AM_XNEWSLETTER_BMH_EMAIL","Email");
-define("_AM_XNEWSLETTER_BMH_SUBJECT","Subject");
-define("_AM_XNEWSLETTER_BMH_MEASURE","Measure");
-define("_AM_XNEWSLETTER_BMH_SUBMITTER","Submitter");
-define("_AM_XNEWSLETTER_BMH_CREATED","Created");
-
-define("_AM_XNEWSLETTER_BMH_MEASURE_PENDING","Pending");
-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_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_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_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_MEASURE_ALL","Show all");
-define("_AM_XNEWSLETTER_BMH_MEASURE_SHOW_NONE","No bmh 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_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_DELETEPROTOCOL","Delete all protocols and reset tables");
-define("_AM_XNEWSLETTER_MAINTENANCE_DELETEPROTOK","Table protocol maintained.");
-define("_AM_XNEWSLETTER_MAINTENANCE_DELETENOTHING","No action necessary.");
-define("_AM_XNEWSLETTER_MAINTENANCE_DELETEUSEROK","%s Users have been deleted");
-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_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_PRESELECT_CAT","Preselect category");
-define("_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL","Available plugins");
-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_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_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_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_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_XOOPSUSER","Options for import/syncronisation XoopsUsers");
-define("_AM_XNEWSLETTER_IMPORT_XOOPSUSER_GROUPS","Select groups");
-
-define("_AM_XNEWSLETTER_NEWTASK","Add New task");
-define("_AM_XNEWSLETTER_TASKLIST","List task");
-define("_AM_XNEWSLETTER_TASK_ADD","Add a task");
-define("_AM_XNEWSLETTER_TASK_EDIT","Edit a task");
-define("_AM_XNEWSLETTER_TASK_DELETE","Delete a task");
-define("_AM_XNEWSLETTER_TASK_ID","Id");
-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_SUBMITTER","Submitter");
-define("_AM_XNEWSLETTER_TASK_CREATED","Created");
-define("_AM_XNEWSLETTER_TASK_ERROR_CREATE","Error creating item in tasklist");
-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_MAINTAINEDBY", "is maintained by the");
-
-define("_AM_XNEWSLETTER_SEND_ERROR_NO_LETTERCONTENT","No text available for printing");
-define("_AM_XNEWSLETTER_IMPORT_INFO","Add all users of a group to a newsletter");
-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_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");
-
-//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!");
+<?php
+/**
+ * ****************************************************************************
+ * XNEWSLETTER - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * Goffy ( wedega.com )
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting
+ * source code which is considered copyrighted (c) material of the
+ * original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright Goffy ( wedega.com )
+ * @license GPL 2.0
+ * @package xNewsletter
+ * @author Goffy ( web...@we... )
+ *
+ * Version : 1 Mon 2012/11/05 14:31:32 : Exp $
+ * ****************************************************************************
+ */
+//General
+define('_AM_XNEWSLETTER_FORMOK', "Registered successfully");
+define('_AM_XNEWSLETTER_FORMDELOK', "Deleted successfully");
+define('_AM_XNEWSLETTER_FORMDELNOTOK', "Error while deleting");
+define('_AM_XNEWSLETTER_FORMSUREDEL', "Are you sure you want to delete: <span class='bold red'>%s</span>");
+define('_AM_XNEWSLETTER_FORMSUREDEL_LIST', "Are you sure you want to delete all protocol items of: <span class='bold red'>%s</span>");
+define('_AM_XNEWSLETTER_FORMSURERENEW', "Are you sure you want renew: <span class='bold red'>%s</span>");
+define('_AM_XNEWSLETTER_FORMUPLOAD', "Upload");
+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_FAILED', "failed");
+define('_AM_XNEWSLETTER_SAVE', "Save");
+define('_AM_XNEWSLETTER_DETAILS', "Show details");
+define('_AM_XNEWSLETTER_SEARCH', "Search");
+define('_AM_XNEWSLETTER_SEARCH_EQUAL', "=");
+define('_AM_XNEWSLETTER_SEARCH_CONTAINS', "contains");
+define('_AM_ACCOUNTS_TYPE_PHPMAIL', "php mail()");
+define('_AM_ACCOUNTS_TYPE_PHPSENDMAIL', "php sendmail()");
+define('_AM_ACCOUNTS_TYPE_POP3', "pop before smtp");
+define('_AM_ACCOUNTS_TYPE_SMTP', "smtp");
+define('_AM_ACCOUNTS_TYPE_GMAIL', "gmail");
+define('_AM_ACCOUNTS_TYPE_NOTREQUIRED', "Not required");
+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_PWD', "password");
+define('_AM_ACCOUNTS_TYPE_POP3_SERVER_IN', "pop3.yourdomain.com");
+define('_AM_ACCOUNTS_TYPE_POP3_PORT_IN', "110");
+define('_AM_ACCOUNTS_TYPE_POP3_SERVER_OUT', "mail.yourdomain.com");
+define('_AM_ACCOUNTS_TYPE_POP3_PORT_OUT', "25");
+define('_AM_ACCOUNTS_TYPE_SMTP_SERVER_IN', "imap.yourdomain.com");
+define('_AM_ACCOUNTS_TYPE_SMTP_PORT_IN', "143");
+define('_AM_ACCOUNTS...
[truncated message content] |
|
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...
[truncated message content] |
|
From: <ce...@us...> - 2013-10-20 15:00:42
|
Revision: 12187
http://sourceforge.net/p/xoops/svn/12187
Author: cesag
Date: 2013-10-20 15:00:39 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Replacing <br/> with <br /> in 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 14:22:43 UTC (rev 12186)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php 2013-10-20 15:00:39 UTC (rev 12187)
@@ -89,7 +89,7 @@
define('_AM_XNEWSLETTER_SEND_ERROR_NO_EMAIL', "Error: No e-mail-address available");
define('_AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID', "Error: No valid newsletter selected");
define('_AM_XNEWSLETTER_SEND_ERROR_INALID_TEMPLATE_PATH', "Error: template path '%p' not found");
-define('_AM_XNEWSLETTER_SEND_SURE_SENT', "This newsletter was already sent to all subscribers.<br/>Do you really want to send this newsletter again to all subscribers?");
+define('_AM_XNEWSLETTER_SEND_SURE_SENT', "This newsletter was already sent to all subscribers.<br />Do you really want to send this newsletter again to all subscribers?");
define('_AM_XNEWSLETTER_SEND_ERROR_NO_SUBSCR', "Error: No valid subscriptions for the selected newsletter(s) found");
//Index
define('_AM_XNEWSLETTER_LETTER', "Newsletter Statistics");
@@ -181,9 +181,9 @@
define('_AM_XNEWSLETTER_CAT_NAME', "Newsletter name");
define('_AM_XNEWSLETTER_CAT_INFO', "Additional info");
define('_AM_XNEWSLETTER_CAT_GPERMS_CREATE', "Permissions to create");
-define('_AM_XNEWSLETTER_CAT_GPERMS_CREATE_DESC', "<br/><span style='font-weight:normal'>- Create new newsletters<br/>- Edit, delete, send of own newsletters</span>");
+define('_AM_XNEWSLETTER_CAT_GPERMS_CREATE_DESC', "<br /><span style='font-weight:normal'>- Create new newsletters<br />- Edit, delete, send of own newsletters</span>");
define('_AM_XNEWSLETTER_CAT_GPERMS_ADMIN', "Permission to admin");
-define('_AM_XNEWSLETTER_CAT_GPERMS_ADMIN_DESC', "<br/><span style='font-weight:normal'>Edit, delete, send of all newsletters of this category</span>");
+define('_AM_XNEWSLETTER_CAT_GPERMS_ADMIN_DESC', "<br /><span style='font-weight:normal'>Edit, delete, send of all newsletters of this category</span>");
define('_AM_XNEWSLETTER_CAT_GPERMS_READ', "Permissions to read/subscribe");
define('_AM_XNEWSLETTER_CAT_GPERMS_LIST', "Permissions to see list of subscribers");
define('_AM_XNEWSLETTER_CAT_SUBMITTER', "Submitter");
@@ -291,10 +291,10 @@
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 possible 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 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_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 email handler successfully finished");
define('_AM_XNEWSLETTER_BMH_MEASURE_ALL', "Show all");
define('_AM_XNEWSLETTER_BMH_MEASURE_SHOW_NONE', "No Bounced email items for measure '%s' available");
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html 2013-10-20 14:22:43 UTC (rev 12186)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html 2013-10-20 15:00:39 UTC (rev 12187)
@@ -68,67 +68,67 @@
<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) 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 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/>
+ 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 emails, start Bounced email 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>
<p class="even">
- You can handle one or more newsletter categories.<br/>
- It is possible to set permissions "read", "create", "admin" and "list subscribers" for each newsletter cat.<br/>
+ You can handle one or more newsletter categories.<br />
+ It is possible to set permissions "read", "create", "admin" and "list subscribers" for each newsletter cat.<br />
<br /><br /></p>
<h5 class="odd">Create a newsletter</h5>
<p class="even">
- 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 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 text editor, allows mime-types and size of mail attachments can be set in module preferences.<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 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 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>
<p class="even">
- The newsletters are template based.<br/>
- The templates you can find in language/{yourlanguage}/templates.<br/>
- To create a new template you have only to make a new html-file in this folder and to put in the smarty-vars.<br/>
+ The newsletters are template based.<br />
+ The templates you can find in language/{yourlanguage}/templates.<br />
+ To create a new template you have only to make a new html-file in this folder and to put in the smarty-vars.<br />
<br /><br /></p>
<h5 class="odd">Sending newsletter</h5>
<p class="even">
- You can show a preview of a newsletter before sending.<br/>
- You can send the newsletter for testing to a defined email-address.<br/>
- The newsletters will be sent subscriber by subscriber.<br/>
- For each sending action a protocol will be created.<br/>
- 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/>
+ You can show a preview of a newsletter before sending.<br />
+ You can send the newsletter for testing to a defined email-address.<br />
+ The newsletters will be sent subscriber by subscriber.<br />
+ For each sending action a protocol will be created.<br />
+ 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 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 emails, start Bounced email handler,... work not with local server (you get white page).<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 emails, start Bounced email handler,... work not with local server (you get white page).<br />
<br /><br /></p>
<h5 class="odd">Task list</h5>
<p class="even">
- If you limit emails send in one package, you can see all newsletters waiting for next cronjob and the time, when cronjob can send the newsletter.<br/>
- If you do not use this option, this list must always be empty.<br/>
- Normally the tab "Task list" is hidden, if this option is disabled.<br/>
+ If you limit emails send in one package, you can see all newsletters waiting for next cronjob and the time, when cronjob can send the newsletter.<br />
+ If you do not use this option, this list must always be empty.<br />
+ Normally the tab "Task list" is hidden, if this option is disabled.<br />
<br /><br /></p>
<h5 class="odd">Handle mailing lists</h5>
<p class="even">
- 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/>
+ 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 "Mailing list" is hidden, if this option is disabled.<br />
@@ -138,26 +138,26 @@
<h5 class="odd">Bounced email handler (BMH)</h5>
<p class="even">
- 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 subscriptions of this email-address<br/>
- -- delete the subscriptions of this email-address<br/>
- <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 subscriptions of this email-address<br />
+ -- delete the subscriptions of this email-address<br />
<br />
+ <br />
<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 using the move hard option (the email will be only moved in this folder, you can check this mail later, if you want).<br/>
+ 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 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 using the move soft option in order to keep your basic in box clean.<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 using the move soft option in order to keep your basic in box clean.<br />
<br />
- Pay attention: functions like testing account, sending emails, start Bounced email 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>
@@ -177,15 +177,15 @@
<li>module subscribers</li>
<li>users from xoops users</li>
<ul>
- 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/>
- You have the possibility<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 to make a subscription or not<br/>
- -- to which newsletter you want to make the subscription<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 />
+ You have the possibility<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 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/
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php 2013-10-20 14:22:43 UTC (rev 12186)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php 2013-10-20 15:00:39 UTC (rev 12187)
@@ -45,12 +45,12 @@
define('_MA_XNEWSLETTER_SUBSCRIPTION_EXIST', "Existing subscriptions");
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_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_SUBSCRIPTION_ADD', "Add a new subscription");
define('_MA_XNEWSLETTER_SUBSCRIPTION_EDIT', "Edit subscriptions");
define('_MA_XNEWSLETTER_SUBSCRIPTION_DELETE', "Delete subscriptions");
-define('_MA_XNEWSLETTER_SUBSCRIPTION_DELETE_SURE', "Do you really want to delete this registration with all subscriptions?<br /><br />If you want to (un)subscribe for one or more newsletters, please use the edit button!<br/><br />");
+define('_MA_XNEWSLETTER_SUBSCRIPTION_DELETE_SURE', "Do you really want to delete this registration with all subscriptions?<br /><br />If you want to (un)subscribe for one or more newsletters, please use the edit button!<br /><br />");
define('_MA_XNEWSLETTER_SUBSCRIPTION_INFO_PERS', "Your personal information");
define('_MA_XNEWSLETTER_SUBSCRIPTION_SELECT_CATS', "Select your newsletter");
define('_MA_XNEWSLETTER_SUBSCRIPTION_CATS_AVAIL', "Available newsletters");
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2013-10-20 14:22:43 UTC (rev 12186)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2013-10-20 15:00:39 UTC (rev 12187)
@@ -72,7 +72,7 @@
define('_MI_XNEWSLETTER_ATTACHMENT_PATH', "Upload-path");
define('_MI_XNEWSLETTER_ATTACHMENT_PATH_DESC', "Define path, where uploaded attachments will be saved ( folders after {XOOPS_ROOT_PATH}/uploads ), <b>with slash at beginning</b> and <b>with tailing slash</b>.");
define('_MI_XNEWSLETTER_USE_MAILINGLIST', "Use additional feature mailinglists");
-define('_MI_XNEWSLETTER_USE_MAILINGLIST_DESC', "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.<br/>The 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.");
+define('_MI_XNEWSLETTER_USE_MAILINGLIST_DESC', "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.<br />The 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.");
define('_MI_XNEWSLETTER_GROUPS_WITHOUT_ACTKEY', "Groups (un)subscribing without confirmation email");
define('_MI_XNEWSLETTER_GROUPS_WITHOUT_ACTKEY_DESC', "Define the groups, which can make (un)subscriptions to a newsletter directly, without sending back a confirmation email");
define('_MI_XNEWSLETTER_GROUPS_CHANGE_OTHER', "Groups with permission to change subscription of other persons");
|
|
From: <go...@us...> - 2014-01-23 15:01:26
|
Revision: 12272
http://sourceforge.net/p/xoops/svn/12272
Author: goffy
Date: 2014-01-23 15:01:19 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
corrections on english language files (cesag)
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php
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 2014-01-21 17:10:06 UTC (rev 12271)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php 2014-01-23 15:01:19 UTC (rev 12272)
@@ -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/trunk/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php 2014-01-21 17:10:06 UTC (rev 12271)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php 2014-01-23 15:01:19 UTC (rev 12272)
@@ -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/trunk/xNewsletter/language/english/modinfo.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2014-01-21 17:10:06 UTC (rev 12271)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2014-01-23 15:01:19 UTC (rev 12272)
@@ -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,7 +80,7 @@
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");
|
|
From: <ce...@us...> - 2014-03-19 10:17:29
|
Revision: 12395
http://sourceforge.net/p/xoops/svn/12395
Author: cesag
Date: 2014-03-19 10:17:26 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
Fixed typos in english language files.
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html 2014-03-19 09:18:33 UTC (rev 12394)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html 2014-03-19 10:17:26 UTC (rev 12395)
@@ -44,10 +44,10 @@
- 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 subscribers, where sending failed<br />
- - Sending newsletters to unlimited number of recipients or in packages with certain number of recipients by using cronjob<br />
+ - Sending newsletters to unlimited number of recipients or in packages with certain number of recipients by using cron job<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,15 +112,15 @@
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 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 />
+ 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 cron job, 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 />
<br /><br /></p>
<h5 class="odd">Task list</h5>
<p class="even">
- If you limit emails send in one package, you can see all newsletters waiting for next cronjob and the time, when cronjob can send the newsletter.<br />
+ If you limit emails send in one package, you can see all newsletters waiting for next cron job and the time, when cron job can send the newsletter.<br />
If you do not use this option, this list must always be empty.<br />
Normally the tab "Task list" is hidden, if this option is disabled.<br />
<br /><br /></p>
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2014-03-19 09:18:33 UTC (rev 12394)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2014-03-19 10:17:26 UTC (rev 12395)
@@ -80,7 +80,7 @@
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 immediately. 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 cron jobs 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");
|