[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_admin.php,1.35.2.2,1.35.2.3 lang_faq.php,1.4,1.4.2.1

[James A. <th...@us...>]

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

Modified Files:
      Tag: phpBB-2_0_0
	lang_admin.php lang_faq.php 
Log Message:
Fixes for bugs: 387, 519, 522, and 456


Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -C2 -r1.35.2.2 -r1.35.2.3
*** lang_admin.php	12 May 2002 15:33:28 -0000	1.35.2.2
--- lang_admin.php	27 Jun 2002 20:06:44 -0000	1.35.2.3
***************
*** 276,280 ****
  $lang['Allow_smilies'] = 'Allow Smilies';
  $lang['Smilies_path'] = 'Smilies Storage Path';
! $lang['Smilies_path_explain'] = 'Path under your phpBB root dir, e.g. images/smilies';
  $lang['Allow_sig'] = 'Allow Signatures';
  $lang['Max_sig_length'] = 'Maximum signature length';
--- 276,280 ----
  $lang['Allow_smilies'] = 'Allow Smilies';
  $lang['Smilies_path'] = 'Smilies Storage Path';
! $lang['Smilies_path_explain'] = 'Path under your phpBB root dir, e.g. images/smiles';
  $lang['Allow_sig'] = 'Allow Signatures';
  $lang['Max_sig_length'] = 'Maximum signature length';
***************
*** 352,355 ****
--- 352,357 ----
  $lang['Forum_delete_explain'] = 'The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained.';
  
+ $lang['Status_locked'] = 'Locked';
+ $lang['Status_unlocked'] = 'Unlocked';
  $lang['Forum_settings'] = 'General Forum Settings';
  $lang['Forum_name'] = 'Forum name';

Index: lang_faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_faq.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** lang_faq.php	15 Dec 2001 16:42:08 -0000	1.4
--- lang_faq.php	27 Jun 2002 20:06:44 -0000	1.4.2.1
***************
*** 40,44 ****
  $faq[] = array("How do I prevent my username appearing in the online user listings?", "In your profile you will find an option <i>Hide your online status</i>, if you switch this <i>on</i> you'll only appear to board administrators or to yourself. You will be counted as a hidden user.");
  $faq[] = array("I've lost my password!", "Don't panic! While your password cannot be retrieved it can be reset. To do this go to the login page and click <u>I've forgotten my password</u>, follow the instructions and you should be back online in no time");
! $faq[] = array("I registered but cannot login!", "Firstly check your are entering the correct username and password. If they are okay then one of two things may have happened. If COPPA support is enabled and you clicked the <u>I am under 13 years old</u> link while registering then you will have to follow the instructions you received. If this is not the case then does your account need activating? Some boards will require all new registrations be activated, either by yourself or by the administrator before you can logon. When you registered it would have told you whether activation was required. If you were sent an email then follow the instructions, if you did not receive the email then are you sure your email address is valid? One reason activation is used is to reduce the possibility of <i>rouge</i> users abusing the board anonymously. If you are sure the email address you used is valid then try contacting the board administrator.");
  $faq[] = array("I registered in the past but cannot login any more?!", "The most likely reasons for this are; you entered an incorrect username or password (check the email you were sent when you first registered) or the administrator has deleted your account for some reason. If it is the later case then perhaps you did not post anything? It is usual for boards to periodically remove users who have not posted anything so as to reduce the size of the database. Try registering again and get involved in discussions.");
  
--- 40,44 ----
  $faq[] = array("How do I prevent my username appearing in the online user listings?", "In your profile you will find an option <i>Hide your online status</i>, if you switch this <i>on</i> you'll only appear to board administrators or to yourself. You will be counted as a hidden user.");
  $faq[] = array("I've lost my password!", "Don't panic! While your password cannot be retrieved it can be reset. To do this go to the login page and click <u>I've forgotten my password</u>, follow the instructions and you should be back online in no time");
! $faq[] = array("I registered but cannot login!", "Firstly check your are entering the correct username and password. If they are okay then one of two things may have happened. If COPPA support is enabled and you clicked the <u>I am under 13 years old</u> link while registering then you will have to follow the instructions you received. If this is not the case then does your account need activating? Some boards will require all new registrations be activated, either by yourself or by the administrator before you can logon. When you registered it would have told you whether activation was required. If you were sent an email then follow the instructions, if you did not receive the email then are you sure your email address is valid? One reason activation is used is to reduce the possibility of <i>rogue</i> users abusing the board anonymously. If you are sure the email address you used is valid then try contacting the board administrator.");
  $faq[] = array("I registered in the past but cannot login any more?!", "The most likely reasons for this are; you entered an incorrect username or password (check the email you were sent when you first registered) or the administrator has deleted your account for some reason. If it is the later case then perhaps you did not post anything? It is usual for boards to periodically remove users who have not posted anything so as to reduce the size of the database. Try registering again and get involved in discussions.");