--- a/language/english/user.json	Sun Oct 25 00:09:11 2009 -0400
+++ b/language/english/user.json	Tue Nov 03 22:08:48 2009 -0500
@@ -47,6 +47,7 @@
       login_success_short: 'Success.',
       login_check_remember: 'Keep me logged in on this computer for %session_length% %length_units% unless I log out',
       login_check_remember_infinite: 'Keep me logged in on this computer until I log out',
+      login_btn_log_in: 'Log in',
       
       login_noact_title: 'Account error',
       login_noact_msg_intro: 'It appears that your user account has not yet been activated.',
@@ -90,11 +91,12 @@
       err_key_wrong_length: 'The encryption key was the wrong length.',
       err_too_big_for_britches: 'You are trying to authenticate at a level that your user account does not permit.',
       err_invalid_credentials: 'You have entered an invalid username or password. Please enter your login details again.',
-      err_invalid_credentials_lockout: ' You have used up %fails% out of %config.lockout_threshold% login attempts. After you have used up all %config.lockout_threshold% login attempts, you will be locked out from logging in for %config.lockout_duration% minutes.',
-      err_invalid_credentials_lockout_captcha: ' You have used up %fails% out of %config.lockout_threshold% login attempts. After you have used up all %config.lockout_threshold% login attempts, you will have to enter a visual confirmation code while logging in, effective for %config.lockout_duration% minutes.',
+      err_invalid_credentials_lockout: ' You have used up %fails% out of %threshold% login attempts. After you have used up all %threshold% login attempts, you will be locked out from logging in for %duration% minutes.',
+      err_invalid_credentials_captcha: ' You have used up %fails% out of %threshold% login attempts. After you have used up all %threshold% login attempts, you will have to enter a visual confirmation code while logging in, effective for %duration% minutes.',
       err_backend_fail: 'You entered the right credentials and everything was validated, but for some reason Enano couldn\'t register your session. This is an internal problem with the site and you are encouraged to contact site administration.',
-      err_locked_out: 'You have used up all %config.lockout_threshold% allowed login attempts. Please wait %time_rem% minute%plural% before attempting to log in again%captcha_blurb%.',
-      err_locked_out_captcha_blurb: ', or enter the visual confirmation code shown above in the appropriate box',
+      err_locked_out_initial_lockout: 'Your computer is locked out from logging in because you entered invalid credentials too many times. This restriction will expire in %time_rem% minute%plural%.',
+      err_locked_out_initial_captcha: 'Please enter the correct visual confirmation code to log in. This restriction will expire in %time_rem% minute%plural%.',
+      err_lockout_bad_captcha: 'The confirmation code you entered was incorrect.',
       err_admin_session_timed_out: 'Your session has timed out; please log in again using the form above.',
       err_email_not_valid: 'The e-mail address you entered is invalid.',