Changeset 6776 for extensions/NBC_UserAdvManager/branches/2.15/language/en_UK/plugin.lang.php

Timestamp:

Aug 18, 2010, 10:56:53 PM (14 years ago)

Author:

Eric

Message:

Merge from Trunk to Branch 2.5

File:

• extensions/NBC_UserAdvManager/branches/2.15/language/en_UK/plugin.lang.php (modified) (4 diffs)

extensions/NBC_UserAdvManager/branches/2.15/language/en_UK/plugin.lang.php

@@ -29 +29 @@
 $lang['Err_audit_advise'] = '<b>you have to perform corrections to comply with new rules that you have activated.<br>Use a database management utility to correct user accounts directly in the table ###_USERS';
 $lang['UAM_Empty Author'] = 'The author field have to be filled to send a comment.';
-if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' )
-        $lang['reg_err_login5'] = 'Username already exist, WARNING name is case insensitive (Shift = Tiny).';
+$lang['reg_err_login5'] = 'Username already exist, WARNING name is case insensitive (Shift = Tiny).';
 $lang['reg_err_login6'] = 'Username does not have to match the following characters: ';
 $lang['reg_err_login7'] = 'Your email provider is banned for registration. Banned email providers are: ';
@@ -56 +55 @@
 $lang['Mail_without_key'] = 'Reminder without key';
 $lang['Mail_with_key'] = 'Reminder with key';
-$lang['Force_Validation'] = 'Forced validation';
 
 
@@ -141 +139 @@
 $lang['UAM_MailInfo_Text'] = ' Customizing the information email:';
 $lang['UAM_Confirm_Mail'] = 'Confirmation of registration:';
-$lang['UAM_Confirm_Mail_true'] = ' Enable';
 $lang['UAM_Confirm_Mail_false'] = ' Disable (default)';
 $lang['UAM_ConfirmMail_Text'] = ' Customizing the confirmation email:';
@@ -262 +259 @@
 Also available, the project\'s bugtracker: <a href="http://piwigo.org/bugs/" onclick="window.open(this.href);return false;">http://piwigo.org/bugs/</a>';
 // --------- End: New or revised $lang ---- from version 2.15.1
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.4
+$lang['Force_Validation'] = 'Manual validation';
+$lang['UAM_Confirm_Mail_true'] = ' Enable - Validation by user';
+$lang['UAM_Confirm_Mail_local'] = ' Enable - Validation by admin (no validation key sent)';
+$lang['UAM_RedirToProfile'] = 'Redirect to "Customization" page';
+$lang['UAM_RedirToProfile_false'] = ' Disable (default)';
+$lang['UAM_RedirToProfile_true'] = ' Enable';
+// --------- End: New or revised $lang ---- from version 2.15.4
 ?>