[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.85,1.86

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

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

Modified Files:
	lang_main.php 
Log Message:
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** lang_main.php	25 Mar 2002 19:22:42 -0000	1.85
--- lang_main.php	20 Apr 2002 00:22:29 -0000	1.86
***************
*** 23,27 ****
  // The format of this file is:
  //
! // ---> $lang['message'] = "text";
  //
  // You should also try to set a locale and a character
--- 23,27 ----
  // The format of this file is:
  //
! // ---> $lang['message'] = 'text';
  //
[...1925 lines suppressed...]
  //
! $lang['Information'] = 'Information';
! $lang['Critical_Information'] = 'Critical Information';
  
! $lang['General_Error'] = 'General Error';
! $lang['Critical_Error'] = 'Critical Error';
! $lang['An_error_occured'] = 'An Error Occurred';
! $lang['A_critical_error'] = 'A Critical Error Occurred';
  
  //
***************
*** 990,992 ****
  // -------------------------------------------------
  
! ?>
--- 992,994 ----
  // -------------------------------------------------
  
! ?>
\ No newline at end of file