X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Flanguage%2Fenglish%2Fuser_lang.php;h=39eb4dbeb379f1a7800924792dc7adeabdb3d73c;hb=refs%2Fheads%2Fmaster;hp=03ca5f2ab7570f4c8a62862616d881cf8af224d8;hpb=355535fa933c0fc2c1d63f0d4df3b1fc6e60d05c;p=living-lab-site.git

diff --git a/application/language/english/user_lang.php b/application/language/english/user_lang.php
index 03ca5f2..39eb4db 100644
--- a/application/language/english/user_lang.php
+++ b/application/language/english/user_lang.php
@@ -3,8 +3,11 @@
 $lang['user_appelation'] = 'User';
 
 // Login / Register/ Account / Profile
+$lang['user_legend_login_normal'] = 'Log in with a %s Account';
+$lang['user_legend_login_openid'] = 'Log in with a Third-party Account';
 $lang['user_username'] = 'User Name';
 $lang['user_username_or_email'] = 'User Name or E-mail';
+$lang['user_openid'] = 'OpenID';
 $lang['user_password'] = 'Password';
 $lang['user_password_confirmation'] = 'Password Confirmation';
 $lang['user_old_password'] = 'Old Password';
@@ -13,10 +16,15 @@ $lang['user_new_password_confirmation'] = 'New Password Confirmation';
 $lang['user_email'] = 'E-mail';
 $lang['user_first_name'] = 'First Name';
 $lang['user_last_name'] = 'Surname';
+$lang['user_sex'] = 'Sex';
+$lang['user_sex_male'] = 'Male';
+$lang['user_sex_female'] = 'Female';
 $lang['user_birth_date'] = 'Birth Date';
 $lang['user_date_format_hint'] = 'use format YEAR-MONTH-DAY';
 $lang['user_country'] = 'Country';
 $lang['user_locality'] = 'City / Town';
+$lang['user_picture'] = 'Picture';
+$lang['user_change_picture'] = 'Change Picture';
 $lang['user_ui_lang'] = 'Site Interface Language';
 $lang['user_time_zone'] = 'Time Zone';
 $lang['user_roles'] = 'Roles';
@@ -25,20 +33,50 @@ $lang['user_video_prefs'] = 'Video Preferences';
 $lang['user_registration_date'] = 'Registration Date';
 $lang['user_last_login'] = 'Last Login Time';
 
-$lang['user_note_required_fields'] = '* Required fields!';
 $lang['user_submit_register'] = 'Register';
 $lang['user_submit_save'] = 'Save';
 
 // Account Activation
 $lang['user_title_activation'] = 'Account Activation';
+$lang['user_title_password_recovery'] = 'Password Recovery';
 $lang['user_legend_activation'] = 'Activate your account';
 $lang['user_instruction_activation'] = 'Shortly after the registration you made you will receive an <em>activation e-mail</em> on your e-mail address you provided. In order to confirm that you are the owner of that e-mail address, follow the link there or enter the <em>activation code</em> also provided in that e-mail in the field below.';
 $lang['user_activation_code'] = 'Activation Code';
 $lang['user_submit_activate'] = 'Activate Account';
+$lang['user_submit_password_recovery'] = 'Recover Password';
 $lang['user_legend_resend_activation'] = 'Resend the activation code';
 $lang['user_instruction_resend_activation'] = 'The <em>activation e-mail</em> can take up to a few minutes until it arrives in your inbox, so please be patient. If you entered a wrong e-mail address, you can change it by entering another one in the field below. Pressing <em>Resend</em> will cause us to retransmit you the <em>activation e-mail</em> on the address entered in this field.';
+$lang['user_instruction_password_recovery'] = 'Enter you username and the e-mail address associated with your account and we will send you a new auto-generated password.';
 $lang['user_submit_resend_activation'] = 'Resend Activation E-mail';
 $lang['user_msg_activated_account'] = 'Your account is active so you can <a href="%s">login</a>. You successfully validated your e-mail address through the <em>activation e-mail</em>.';
+$lang['user_msg_wrong_activation_code'] = 'Wrong account activation code!';
+$lang['user_msg_activation_resent'] = 'Activation e-mail has been resent to %s!';
+$lang['user_msg_password_recovery_email_sent'] = 'An e-mail with a new password for user %s has been sent to %s.';
+$lang['user_link_password_recovery'] = 'Did you forget your password?';
+$lang['user_activation_email_content'] =
+"Hello %s,
+
+Please confirm that you registered a new account on %s (%s) by following the link below:
+
+%s
+
+If the link does not work try to copy it and then paste it into your address bar.
+
+Alternatively you can use the following Activation Code: %s
+
+Thank for registering!
+";
+$lang['user_password_recovery_email_content'] =
+"Hello %s,
+
+You requested a password recovery on %s (%s). Here is your new auto-generated password:
+
+%s
+
+It is recommended to change this password after you log in.
+
+Best regards!
+";
 
 $lang['user_no_videos_uploaded'] = 'The user uploaded no videos.';