Changeset 17511 for extensions/UserAdvManager/branches/2.30/language/en_UK/plugin.lang.php

Timestamp:

Aug 9, 2012, 10:18:14 PM (12 years ago)

Author:

Eric

Message:

r17510 merged from trunk to branch 2.30

File:

• extensions/UserAdvManager/branches/2.30/language/en_UK/plugin.lang.php (modified) (2 diffs)

extensions/UserAdvManager/branches/2.30/language/en_UK/plugin.lang.php

@@ -235 +235 @@
 $lang['UAM %d users pwdreseted'] = 'Password renewal required for %d users';
 $lang['UAM_Error_Using_illegal_Kdays'] = 'Using the [Kdays] tag is allowed only if the deadline for registration confirmation limited is active. Refer to the text field in red to correct the problem.';
-$lang['UAM_Default_InfoMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery].
-
-Please, find find below your connexion information.';
+$lang['UAM_Default_InfoMail_Txt'] = 'Hello [username]!
+
+You made significant changes in your profile on the gallery [mygallery]. Please, find below your new settings:';
 $lang['UAM_Default_ConfirmMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery].
 
@@ -403 +403 @@
 $lang['UAM_Tracking confirmations'] = 'Tracking confirmations';
 // --------- End: New or revised $lang ---- from version 2.30.3
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.40.4 and 2.30.7
+$lang['UAM_mail_exclusion_error'] = 'The Piwigo\'s option "The email address is mandatory for all users" has been disabled while the UserAdvancedManager\'s (UAM) plugin option "Exclusion of mail domains" remained active. This combination is illogical and not compatible!<br><br>
+Please, Reactivate the Piwigo\'s option "The email address is mandatory for all users" to be able then to disable UAM\'s option "Exclusion of mail domains" if that\'s what you want.<br><br>
+Note: This message will disappear after you have made the necessary correction and reloaded the admin page.<br><br>';
+// --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7
 ?>