Changeset 18482 for extensions/UserAdvManager/branches/2.40/language/en_UK

Timestamp:

Oct 5, 2012, 9:17:19 PM (12 years ago)

Author:

Eric

Message:

Rollback branch 2.40 to r17809 - The new activ branch is 2.41
Branch 2.40 is no more supported

Location:

extensions/UserAdvManager/branches/2.40/language/en_UK

Files:

• help.lang.php (modified) (1 diff)
• plugin.lang.php (modified) (8 diffs)

extensions/UserAdvManager/branches/2.40/language/en_UK/help.lang.php

@@ -219 +219 @@
 <br><br>
 <b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.';
-$lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or administrators to manually activate the registration.
-<br><br>
-In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking confirmations&quot; tab.
-<br><br>
-In second case, the validation link is send to the gallery administrators. Visitors have to wait until an administrator confirm them himself by using the validation link or in &quot;confirmation tracking&quot; tab.
+$lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or the administrator to manually activate the registration.<br><br>
+In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking confirmations&quot; tab.<br><br>
+In second case, <b><u>there is no confirmation key send by email!</u></b>. Visitors have to wait until an administrator confirm them himself in &quot;confirmation tracking&quot; tab. It\s recommanded to activate the Piwigo\'s option &quot;Email admins when a new user registers&quot; (see in Piwigo\'s configuration options) and to use the &quot;Information email to user&quot; to warn new registers to wait on their account activation.
 <br>
 <b style=&quot;color: red;&quot;>NB: Options &quot;Deadline for confirmation of registration limited&quot; and &quot;Remind unconfirmed users  &quot; have to be set to off when admin\'s manual confirmation is enabled.</b>

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

@@ -14 +14 @@
 $lang['UAM_User: %s'] = 'User : %s';
 $lang['UAM_Password: %s'] = 'Password: %s';
-$lang['UAM_Link: %s'] = 'Please, click on this link to confirm the registration : %s';
+$lang['UAM_Link: %s'] = 'Please, click on this link to confirm your registration : %s';
 
 
@@ -155 +155 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.15.4
-$lang['UAM_Manual_Validation'] = 'Manual confirmation';
+$lang['UAM_Force_Validation'] = 'Manual confirmation';
 $lang['UAM_Confirm_Mail_true'] = ' Enable - Confirmation by user';
-$lang['UAM_Confirm_Mail_local'] = ' Enable - Confirmation by admin';
+$lang['UAM_Confirm_Mail_local'] = ' Enable - Confirmation by admin (no confirmation key sent)';
 // --------- End: New or revised $lang ---- from version 2.15.4
 
@@ -166 +166 @@
 $lang['UAM_GTAuto'] = 'Automatic management of ghosts users';
 $lang['UAM_GTAutoDel'] = 'Automatic deletion of accounts';
-$lang['UAM_Deleted_Account_Redirection_Page'] = 'Access denied - Account destroyed!';
-$lang['UAM_title_redir_page'] = 'Access denied for having an account destroyed!';
 $lang['UAM_Error_GTAutoMail_cannot_be_set_without_ConfirmMail'] = 'Consistency error in the chosen configuration:
 <br><br>
@@ -252 +250 @@
 $lang['UAM_Default_GhstDeletion_Txt'] = 'Sorry [username], your account has been deleted due to a too long time passed since your last visit at [mygallery]. Please register again.';
 $lang['UAM_Default_PwdRequest_Txt'] = 'You have requested a password reset on our gallery. Please, find below your new connection settings.';
-$lang['UAM_Default_CfmMail_Custom_Txt1'] = 'Welcome [username]! You have confirmed that you are human and may now use [mygallery]!';
+$lang['UAM_Default_CfmMail_Custom_Txt1'] = '[username] account successfully validated!';
 $lang['UAM_DumpTxt'] = 'Backup and restore your configuration';
 $lang['UAM_Restore'] = 'To restore the backup file of your configuration. Only the saved file on the server is taken into account.
@@ -278 +276 @@
 $lang['UAM_NewFeature'] = 'New feature !';
 $lang['UAM_RejectConnexion_Custom_Txt'] = 'Customize rejection text';
-$lang['UAM_Reject_Page_Title'] = 'Connexion not allowed !';
 // --------- End: New or revised $lang ---- from version 2.30.2
 
@@ -289 +286 @@
 $lang['UAM_Stuffs_Desc'] = 'Adds an information block for unconfirmed users';
 /* Email confirmation page */
-$lang['UAM_title_confirm_mail'] = 'Confirm your registration';
-$lang['UAM_confirm_mail_page_title'] = 'Confirm your registration';
 $lang['UAM_%d_Validated_User'] = '%d User confirmed manually';
 $lang['UAM_%d_Validated_Users'] = '%d Users confirmed manually';
@@ -397 +392 @@
 
 Note: After this period, your account will be permanently deleted.';
-$lang['UAM_Default_CfmMail_Custom_Txt2'] = 'Your activation key is incorrect or expired or you have already confirmed your account, please contact the webmaster to fix this problem.';
+$lang['UAM_Default_CfmMail_Custom_Txt2'] = 'Incorrect / expired activation key or account already validated.';
 $lang['UAM_RejectConnexion'] = 'Reject user\'s connexion until registration is confirmed';
-$lang['UAM_Default_RejectConnexion_Txt'] = 'Sorry, you don\'t have confirmed your registration yet, so you can\'t connect the gallery now. Please check your email box. You should find an email sent by the gallery, containing a link to perform your confirmation. If not, please contact the webmaster.';
+$lang['UAM_Default_RejectConnexion_Txt'] = 'Sorry, your registration is not validated yet, so you can\'t connect the gallery now.';
 $lang['UAM_Tracking registered users'] = 'Tracking registered users';
 $lang['UAM_Tracking confirmations'] = 'Tracking confirmations';
@@ -427 +422 @@
 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
-
-
-// --------- Starting below: New or revised $lang ---- from version 2.41.0
-$lang['UAM_Subject admin validation for %s'] = 'Registration of %s waits for validation';
-$lang['UAM_Manual_validation_needed_for %s'] = 'The user %s has registered and awaits for manual validation by an admin.';
-// --------- End: New or revised $lang ---- from version 2.41.0
 ?>