X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;ds=sidebyside;f=application%2Flanguage%2Fenglish%2Fuser_lang.php;h=31285a672c1aafe67f12f73f311903b8c2418aec;hb=a69349a99360f6cb64ae3d87f6572f1d8a98400f;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..31285a6 100644
--- a/application/language/english/user_lang.php
+++ b/application/language/english/user_lang.php
@@ -17,6 +17,8 @@ $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';
@@ -31,14 +33,45 @@ $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 activation e-mail 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 activation code 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 activation e-mail 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 Resend will cause us to retransmit you the activation e-mail 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 login. You successfully validated your e-mail address through the activation e-mail.';
+$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.';