Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12187] XoopsModules/xnewsletter/trunk/xNewsletter/ language/english
|
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");
|
