added some fine tuning of english messages for lost password

added login after verification so that transition to account page works
removed output buffering in make_captcha_img so that the image shows up


git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@2848 f5dc347c-c33d-0410-90a0-b07cc1902cb9

lang/strings_english.txt

@@ -9,11 +9,11 @@
 	###########################################################################
 	# English strings for Mantis
 	# -------------------------------------------------
-	# $Revision: 1.201 $
+	# $Revision: 1.202 $
 	# $Author: thraxisp $
-	# $Date: 2004-08-14 15:26:22 $
+	# $Date: 2004-08-14 17:45:29 $
 	#
-	# $Id: strings_english.txt,v 1.201 2004-08-14 15:26:22 thraxisp Exp $
+	# $Id: strings_english.txt,v 1.202 2004-08-14 17:45:29 thraxisp Exp $
 	###########################################################################
 ?>
 <?php
@@ -228,8 +228,8 @@ $MANTIS_ERROR[ERROR_SIGNUP_NOT_MATCHING_CAPTCHA] = 'Confirmation hash does not m
 $MANTIS_ERROR[ERROR_LOST_PASSWORD_NOT_ENABLED] = 'The \'lost your password\' feature is not available.';
 $MANTIS_ERROR[ERROR_LOST_PASSWORD_NO_EMAIL_SPECIFIED] = 'You must provide an e-mail address in order to reset the password';
 $MANTIS_ERROR[ERROR_LOST_PASSWORD_NOT_MATCHING_DATA] = 'The provided information doesn\'t match any registered account!';
-$MANTIS_ERROR[ERROR_LOST_PASSWORD_CONFIRM_HASH_INVALID] = 'The confirmation URL is invalid.';
-$MANTIS_ERROR[ERROR_LOST_PASSWORD_MAX_IN_PROGRESS_ATTEMPTS_REACHED] = 'Max. number of in-progress requests reached. Not allowed to continue with further request.';
+$MANTIS_ERROR[ERROR_LOST_PASSWORD_CONFIRM_HASH_INVALID] = 'The confirmation URL is invalid or has already been used. Please signup again.';
+$MANTIS_ERROR[ERROR_LOST_PASSWORD_MAX_IN_PROGRESS_ATTEMPTS_REACHED] = 'Max. number of in-progress requests reached. Please contact the system administrator';
 
 #$s_login_error = 'Your account may be disabled or blocked (due to too many failed login attempts) or the username/password you entered is incorrect.';
 $s_login_error = 'Your account may be disabled or blocked or the username/password you entered is incorrect.';