X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Flanguage%2Fenglish%2Fform_validation_lang.php;h=8ca5b5b75872d0ff01219ae44b3b00147ebc3a8a;hb=9cc2a6602b47ac97d72efa51ec654418b252b4e4;hp=2961a226b72c14839739c52c0151542ba16ae311;hpb=adc2c33c37c781444c4234c6fed38e95d084ed8d;p=living-lab-site.git

diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php
index 2961a22..8ca5b5b 100644
--- a/application/language/english/form_validation_lang.php
+++ b/application/language/english/form_validation_lang.php
@@ -1,9 +1,27 @@
 <?php
 
+// Merge with standard language entries.
 include('system/language/english/form_validation_lang.php');
 
-$lang['_valid_username']	= "You must enter an e-mail address or a valid username.";
-$lang['_do_login']			= "Wrong %s, or wrong %s.";
+// Login / Register/ Account / Profile
+$lang['_valid_username']			= 'You must enter a valid username with letters, numbers, . (dots) or _ (underscores).';
+$lang['_valid_username_or_email']	= "You must enter an e-mail address or a valid username.";
+$lang['_do_login']					= 'Wrong %s, or wrong %s.';
+$lang['_valid_date']				= 'Invalid %s! Use the specified format or leave the field blank if you don\'t want to specify it.';
+$lang['_valid_old_password']		= 'Wrong %s.';
+$lang['_change_password_cond']		= 'If you want to change your password complete all three password related fields.';
+$lang['_required_by_register']		= 'The %s field is required.';
+
+// Account Activation
+$lang['_valid_activation_code']		= 'Invalid activation code. You must provide 16 hexa characters.';
+$lang['_do_activate']				= 'Wrong activation code.';
+$lang['_do_resend_activation']		= 'An error occurred while resending your activation e-mail. This is not a permanent error. Please try again later.';
+
+// Password Recovery
+$lang['_username_exists']			= 'There is no account registered with this username.';
+$lang['_internal_account']			= 'You cannot change the password for this account because authentication is provided by a third-party.';
+$lang['_do_recover_password']		= 'Username and e-mail address are not associated with the same account.';
+
 
 
 /* End of file form_validation_lang.php */