[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_admin.php,1.33,1.34 lang_main.php,1.83,1.84

[Doug K. <dou...@us...>]

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

Modified Files:
	lang_admin.php lang_main.php 
Log Message:
Ok, this includes fixes for bugs numbered 526000, 524591, 520370, and 520872.  Manily, a few typos were fixed, along with a problem in the jumpbox (fixed using a quick Javascript check, there really isn't another way without modifying some large portions of code), and a problem in the rank control panel.  In other words, everything assigned to me (as of this morning) has been fixed.  I also ran the lovely fix_files.sh, so CVS might be a little wacky and try to update everything.  I hope not...

That's it for now!
dougk_ff7


Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** lang_admin.php	15 Feb 2002 15:36:35 -0000	1.33
--- lang_admin.php	10 Mar 2002 03:23:55 -0000	1.34
***************
*** 506,510 ****
  // Mass Email
  //
! $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for amass emailing to take a long time, you will be notified when the script has completed";
  $lang['Compose'] = "Compose"; 
  
--- 506,510 ----
  // Mass Email
  //
! $lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed";
  $lang['Compose'] = "Compose"; 
  
***************
*** 537,540 ****
--- 537,541 ----
  $lang['Rank_added'] = "The rank was successfully added";
  $lang['Rank_removed'] = "The rank was successfully deleted";
+ $lang['No_update_ranks'] = "The rank was successfully deleted, however user accounts using this rank were not updated.  You will need to manually reset the rank on these accounts";
  
  $lang['Click_return_rankadmin'] = "Click %sHere%s to return to Rank Administration";

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** lang_main.php	6 Mar 2002 00:36:22 -0000	1.83
--- lang_main.php	10 Mar 2002 03:23:55 -0000	1.84
***************
*** 532,536 ****
  $lang['Incomplete_URL'] = "The URL you entered is incomplete";
  $lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid";
! $lang['No_send_account_inactive'] = "Sorry but you're password cannot be retrieved because you account is currently inactive. Please contact the forum administrator for more information";
  
  $lang['Always_smile'] = "Always enable Smilies";
--- 532,536 ----
  $lang['Incomplete_URL'] = "The URL you entered is incomplete";
  $lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid";
! $lang['No_send_account_inactive'] = "Sorry, but your password cannot be retrieved because your account is currently inactive. Please contact the forum administrator for more information";
  
  $lang['Always_smile'] = "Always enable Smilies";