Ignore:
Timestamp:
Sep 22, 2010, 5:25:06 PM (14 years ago)
Author:
Eric
Message:

Merge from Trunk to Branch 2.15

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/branches/2.15/language/en_UK/help/plugin.lang.php

    r6823 r7000  
    3535Note: If the user account created wants to change password and strengthening passwords for users is active, it will be subject to the rule set.';
    3636$lang['UAM_mailexcTitle'] = 'Exclusion of mail domains';
    37 $lang['UAM_mailexcTitle_d'] = 'By default, Piwigo accepts all email addresses in the format xxx@yyy.zz. Enabling this option allows you to exclude certain domains in the format: @ [domain_name].[domain_extension].<br><br>
    38 Examples :<br>
    39 @hotmail.com -> excluding addresses *@hotmail.com<br>
    40 @hotmail -> excluding all addresses *@hotmail*';
    4137$lang['UAM_infomailTitle'] = 'Information email to user';
    4238$lang['UAM_infomailTitle_d'] = 'This option allows to automate sending an information email to a user when registering or when changes his password or email address in their profile.<br><br>
     
    183179Please note: This feature does not apply to all registered users. Those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status are excluded.';
    184180// --------- End: New or revised $lang ---- from version 2.15.6
     181
     182// --------- Starting below: New or revised $lang ---- from version 2.15.7
     183$lang['UAM_mailexcTitle_d'] = 'By default, Piwigo accepts all email addresses in the format xxx@yyy.zz. Enabling this option allows you to exclude certain domains in the format: @ [domain_name].[domain_extension].<br><br>
     184Examples :<br>
     185@hotmail.com -> excluding addresses *@hotmail.com<br>
     186@hotmail -> excluding all addresses *@hotmail*
     187<br><br>
     188<b style=&quot;color: red;&quot;>The seizure is only possible after registration of the option in the activated position.</b>';
     189// --------- End: New or revised $lang ---- from version 2.15.7
    185190?>
Note: See TracChangeset for help on using the changeset viewer.