[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.79,1.80

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv10652/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
Fix various bugs; password length warning, proper warnings for username/email errors

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -r1.79 -r1.80
*** lang_main.php	2002/01/27 01:20:15	1.79
--- lang_main.php	2002/01/27 03:10:35	1.80
***************
*** 525,529 ****
  $lang['No_user_id_specified'] = "Sorry but that user does not exist";
  $lang['Wrong_Profile'] = "You cannot modify a profile that is not your own.";
! $lang['Sorry_banned_or_taken_email'] = "Sorry but the email address you gave has either been banned, is already registered to another user or is invalid. Please try an alternative address, if that is also banned you should contact the board administrator for advice";
  $lang['Only_one_avatar'] = "Only one type of avatar can be specified";
  $lang['File_no_data'] = "The file at the URL you gave contains no data";
--- 525,529 ----
  $lang['No_user_id_specified'] = "Sorry but that user does not exist";
  $lang['Wrong_Profile'] = "You cannot modify a profile that is not your own.";
! 
  $lang['Only_one_avatar'] = "Only one type of avatar can be specified";
  $lang['File_no_data'] = "The file at the URL you gave contains no data";
***************
*** 553,556 ****
--- 553,557 ----
  $lang['New_password'] = "New password";
  $lang['Confirm_password'] = "Confirm password";
+ $lang['Confirm_password_explain'] = "You must confirm your current password if you wish to change it or alter your email address";
  $lang['password_if_changed'] = "You only need to supply a password if you want to change it";
  $lang['password_confirm_if_changed'] = "You only need to confirm your password if you changed it above";
***************
*** 584,588 ****
  $lang['Password_mismatch'] = "The passwords you entered did not match";
  $lang['Current_password_mismatch'] = "The current password you supplied does not match that stored in the database";
! $lang['Invalid_username'] = "The username you requested has been taken or disallowed, or contains invalid characters like the \" character";
  $lang['Signature_too_long'] = "Your signature is too long";
  $lang['Fields_empty'] = "You must fill in the required fields";
--- 585,595 ----
  $lang['Password_mismatch'] = "The passwords you entered did not match";
  $lang['Current_password_mismatch'] = "The current password you supplied does not match that stored in the database";
! $lang['Password_long'] = "Your password must be no more than 32 characters";
! $lang['Username_taken'] = "Sorry but this username has already been taken";
! $lang['Username_invalid'] = "Sorry but this username contains an invalid character such as \"";
! $lang['Username_disallowed'] = "Sorry but this username has been disallowed";
! $lang['Email_taken'] = "Sorry but that email address is already registered to a user";
! $lang['Email_banned'] = "Sorry but this email address has been banned";
! $lang['Email_invalid'] = "Sorry but this email address is invalid";
  $lang['Signature_too_long'] = "Your signature is too long";
  $lang['Fields_empty'] = "You must fill in the required fields";