[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.55,1.56 lang_admin.php,1.10,1.11

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

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

Modified Files:
	lang_main.php lang_admin.php 
Log Message:
Spelling errors and minor changes ... getting quite chilly now

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** lang_main.php	2001/11/27 17:36:04	1.55
--- lang_main.php	2001/11/27 22:14:24	1.56
***************
*** 32,36 ****
  //
  
! setlocale(LC_ALL, "en");
  $lang['ENCODING'] = "utf-8";
  $lang['DIRECTION'] = "LTR";
--- 32,36 ----
  //
  
! //setlocale(LC_ALL, "en");
  $lang['ENCODING'] = "utf-8";
  $lang['DIRECTION'] = "LTR";
***************
*** 300,304 ****
  
  $lang['Flood_Error'] = "You cannot make another post so soon after your last, please try again in a short while";
! $lang['Empty_subject'] = "You must specifiy a subject when posting a new topic";
  $lang['Empty_message'] = "You must enter a message when posting";
  $lang['Announce_and_sticky'] = "You cannot post a topic that is both an announcement and a sticky topic";
--- 300,304 ----
  
  $lang['Flood_Error'] = "You cannot make another post so soon after your last, please try again in a short while";
! $lang['Empty_subject'] = "You must specify a subject when posting a new topic";
  $lang['Empty_message'] = "You must enter a message when posting";
  $lang['Announce_and_sticky'] = "You cannot post a topic that is both an announcement and a sticky topic";
***************
*** 466,470 ****
  $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 retrived because you account is currently inactive. Please contact the forum administrator for more information";
  
  $lang['Always_smile'] = "Always enable Smilies";
--- 466,470 ----
  $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";
***************
*** 607,611 ****
  $lang['Group_hidden_members'] = "This group is hidden, you cannot view its membership";
  $lang['No_pending_group_members'] = "This group has no pending members";
! $lang["Group_joined"] = "You have successfully subscribed to this group<br />You will be notifed when your subscription is approved by the group moderator";
  $lang['Group_request'] = "A request to join your group has been made";
  $lang['Group_approved'] = "Your request has been approved";
--- 607,611 ----
  $lang['Group_hidden_members'] = "This group is hidden, you cannot view its membership";
  $lang['No_pending_group_members'] = "This group has no pending members";
! $lang["Group_joined"] = "You have successfully subscribed to this group<br />You will be notified when your subscription is approved by the group moderator";
  $lang['Group_request'] = "A request to join your group has been made";
  $lang['Group_approved'] = "Your request has been approved";
***************
*** 620,624 ****
  $lang['Confirm_unsub_pending'] = "Your subscription to this group has not yet been approved, are you sure you want to unsubscribe?";
  
! $lang['Unsub_success'] = "You have been unsubscribed from this group.";
  
  $lang['Approve_selected'] = "Approve Selected";
--- 620,624 ----
  $lang['Confirm_unsub_pending'] = "Your subscription to this group has not yet been approved, are you sure you want to unsubscribe?";
  
! $lang['Unsub_success'] = "You have been un-subscribed from this group.";
  
  $lang['Approve_selected'] = "Approve Selected";
***************
*** 897,902 ****
  $lang['General_Error'] = "General Error";
  $lang['Critical_Error'] = "Critical Error";
! $lang['An_error_occured'] = "An Error Occured";
! $lang['A_critical_error'] = "A Critical Error Occured";
  
  $lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password";
--- 897,902 ----
  $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";
  
  $lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password";

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** lang_admin.php	2001/11/24 01:51:36	1.10
--- lang_admin.php	2001/11/27 22:14:24	1.11
***************
*** 37,48 ****
  $lang['Configuration'] = "Configuration";
  $lang['Permissions'] = "Permissions";
! $lang['Manage'] = "Manage";
! $lang['Disallow'] = "Disallow usernames";
  $lang['Prune'] = "Pruning";
! $lang['Mass_Email'] = "Send Bulk Email";
  $lang['Ranks'] = "Ranks";
  $lang['Smilies'] = "Smilies";
  $lang['Ban_Management'] = "Ban Control";
! $lang['Word_Censor'] = "Word Censoring";
  $lang['Export'] = "Export";
  $lang['Create_new'] = "Create";
--- 37,48 ----
  $lang['Configuration'] = "Configuration";
  $lang['Permissions'] = "Permissions";
! $lang['Manage'] = "Management";
! $lang['Disallow'] = "Disallow names";
  $lang['Prune'] = "Pruning";
! $lang['Mass_Email'] = "Mass Email";
  $lang['Ranks'] = "Ranks";
  $lang['Smilies'] = "Smilies";
  $lang['Ban_Management'] = "Ban Control";
! $lang['Word_Censor'] = "Word Censors";
  $lang['Export'] = "Export";
  $lang['Create_new'] = "Create";
***************
*** 92,96 ****
  $lang['Backup'] = "Backup";
  $lang['Restore_explain'] = "This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may upload a gzip compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.";
! $lang['Backup_explain'] = "Here you can backup all your phpBB related data. If you have any additional custom tables in the same database with phpBB that you would like to back up as well please enter their names seperated by commas in the Additional Tables textbox below. If your server supports it you may also gzip compress the file to reduce its size before download.";
  
  $lang['Backup_options'] = "Backup options";
--- 92,96 ----
  $lang['Backup'] = "Backup";
  $lang['Restore_explain'] = "This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may upload a gzip compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.";
! $lang['Backup_explain'] = "Here you can backup all your phpBB related data. If you have any additional custom tables in the same database with phpBB that you would like to back up as well please enter their names separated by commas in the Additional Tables textbox below. If your server supports it you may also gzip compress the file to reduce its size before download.";
  
  $lang['Backup_options'] = "Backup options";
***************
*** 217,221 ****
  $lang['No_banned_email'] = "No banned email addresses";
  
! $lang['Ban_update_sucessful'] = "The banlist has been updated sucessfully";
  
  
--- 217,221 ----
  $lang['No_banned_email'] = "No banned email addresses";
  
! $lang['Ban_update_sucessful'] = "The banlist has been updated successfully";
  
  
***************
*** 255,259 ****
  $lang['Allow_BBCode'] = "Allow BBCode";
  $lang['Allowed_tags'] = "Allowed HTML tags";
! $lang['Allowed_tags_explain'] = "Seperate tags with commas";
  $lang['Allow_smilies'] = "Allow Smilies";
  $lang['Smilies_path'] = "Smilies Storage Path";
--- 255,259 ----
  $lang['Allow_BBCode'] = "Allow BBCode";
  $lang['Allowed_tags'] = "Allowed HTML tags";
! $lang['Allowed_tags_explain'] = "Separate tags with commas";
  $lang['Allow_smilies'] = "Allow Smilies";
  $lang['Smilies_path'] = "Smilies Storage Path";
***************
*** 316,320 ****
  $lang['Action'] = "Action";
  $lang['Update_order'] = "Update Order";
! $lang['Config_updated'] = "Forum Configuration Updated Sucessfully";
  $lang['Edit'] = "Edit";
  $lang['Delete'] = "Delete";
--- 316,320 ----
  $lang['Action'] = "Action";
  $lang['Update_order'] = "Update Order";
! $lang['Config_updated'] = "Forum Configuration Updated Successfully";
  $lang['Edit'] = "Edit";
  $lang['Delete'] = "Delete";
***************
*** 394,398 ****
  $lang['Look_up_user'] = "Look up user";
  
! $lang['Admin_user_fail'] = "Couldn't update the user's profiile.";
  $lang['Admin_user_updated'] = "The user's profile was successfully updated.";
  $lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration";
--- 394,398 ----
  $lang['Look_up_user'] = "Look up user";
  
! $lang['Admin_user_fail'] = "Couldn't update the user's profile.";
  $lang['Admin_user_updated'] = "The user's profile was successfully updated.";
  $lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration";
***************
*** 481,485 ****
  // 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 receptients. If you are emailing a large group of people please be patient after submiting 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"; 
  
--- 481,485 ----
  // 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"; 
  
***************
*** 498,502 ****
  $lang['DB_config'] = "Database Configuration";
  $lang['Admin_config'] = "Admin Configuration";
! $lang['Installer_Error'] = "An error has occured during installation";
  $lang['Previous_Install'] = "A previous installation has been detected";
  $lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist";
--- 498,502 ----
  $lang['DB_config'] = "Database Configuration";
  $lang['Admin_config'] = "Admin Configuration";
! $lang['Installer_Error'] = "An error has occurred during installation";
  $lang['Previous_Install'] = "A previous installation has been detected";
  $lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist";
***************
*** 512,519 ****
  $lang['Inst_Step_2'] = "Your admin username has been created.  At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.";
  $lang['Finish_Install'] = "Finish Installation";
! $lang['Install_db_error'] = "An error occured trying to update the database";
  $lang['ODBC_Instructs'] = "To complete your installation of this database you need to create a System Data Source Name, or System DSN pointing towards the relevant data source. You should refer to the ODBC section of your database server installation manual for assistance. If you are hosting this board on a host to which you do not have control you should request your provider to install or run the necessary files and create an appropriate DSN.";
  $lang['Table_Prefix'] = "Prefix for tables in database";
! $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
  $lang['ftp_choose'] = "Choose Download Method";
--- 512,519 ----
  $lang['Inst_Step_2'] = "Your admin username has been created.  At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.";
  $lang['Finish_Install'] = "Finish Installation";
! $lang['Install_db_error'] = "An error occurred trying to update the database";
  $lang['ODBC_Instructs'] = "To complete your installation of this database you need to create a System Data Source Name, or System DSN pointing towards the relevant data source. You should refer to the ODBC section of your database server installation manual for assistance. If you are hosting this board on a host to which you do not have control you should request your provider to install or run the necessary files and create an appropriate DSN.";
  $lang['Table_Prefix'] = "Prefix for tables in database";
! $lang['Unwriteable_config'] = "Your config file is un-writeable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
  $lang['ftp_choose'] = "Choose Download Method";
***************
*** 598,602 ****
  
  $lang['Create_theme'] = "Create Theme";
! $lang['Create_theme_explain'] = "Use the form below to create a new theme for a selected template. When entering colours (for which you should use hexadecimal notation) you must not include the initial #, ie. CCCCCC is valid, #CCCCCC is not";
  
  $lang['Export_themes'] = "Export Themes";
--- 598,602 ----
  
  $lang['Create_theme'] = "Create Theme";
! $lang['Create_theme_explain'] = "Use the form below to create a new theme for a selected template. When entering colours (for which you should use hexadecimal notation) you must not include the initial #, i.e.. CCCCCC is valid, #CCCCCC is not";
  
  $lang['Export_themes'] = "Export Themes";
***************
*** 625,649 ****
  $lang['Stylesheet'] = "CSS Stylesheet";
  $lang['Background_image'] = "Background Image";
! $lang['Background_color'] = "Background Color";
  $lang['Theme_name'] = "Theme Name";
! $lang['Link_color'] = "Link Color";
! $lang['VLink_color'] = "Visited Link Color";
! $lang['ALink_color'] = "Active Link Color";
! $lang['HLink_color'] = "Hover Link Color";
! $lang['Tr_color1'] = "Table Row Color 1";
! $lang['Tr_color2'] = "Table Row Color 2";
! $lang['Tr_color3'] = "Table Row Color 3";
  $lang['Tr_class1'] = "Table Row Class 1";
  $lang['Tr_class2'] = "Table Row Class 2";
  $lang['Tr_class3'] = "Table Row Class 3";
! $lang['Th_color1'] = "Table Header Color 1";
! $lang['Th_color2'] = "Table Header Color 2";
! $lang['Th_color3'] = "Table Header Color 3";
  $lang['Th_class1'] = "Table Header Class 1";
  $lang['Th_class2'] = "Table Header Class 2";
  $lang['Th_class3'] = "Table Header Class 3";
! $lang['Td_color1'] = "Table Cell Color 1";
! $lang['Td_color2'] = "Table Cell Color 2";
! $lang['Td_color3'] = "Table Cell Color 3";
  $lang['Td_class1'] = "Table Cell Class 1";
  $lang['Td_class2'] = "Table Cell Class 2";
--- 625,649 ----
  $lang['Stylesheet'] = "CSS Stylesheet";
  $lang['Background_image'] = "Background Image";
! $lang['Background_color'] = "Background Colour";
  $lang['Theme_name'] = "Theme Name";
! $lang['Link_color'] = "Link Colour";
! $lang['VLink_color'] = "Visited Link Colour";
! $lang['ALink_color'] = "Active Link Colour";
! $lang['HLink_color'] = "Hover Link Colour";
! $lang['Tr_color1'] = "Table Row Colour 1";
! $lang['Tr_color2'] = "Table Row Colour 2";
! $lang['Tr_color3'] = "Table Row Colour 3";
  $lang['Tr_class1'] = "Table Row Class 1";
  $lang['Tr_class2'] = "Table Row Class 2";
  $lang['Tr_class3'] = "Table Row Class 3";
! $lang['Th_color1'] = "Table Header Colour 1";
! $lang['Th_color2'] = "Table Header Colour 2";
! $lang['Th_color3'] = "Table Header Colour 3";
  $lang['Th_class1'] = "Table Header Class 1";
  $lang['Th_class2'] = "Table Header Class 2";
  $lang['Th_class3'] = "Table Header Class 3";
! $lang['Td_color1'] = "Table Cell Colour 1";
! $lang['Td_color2'] = "Table Cell Colour 2";
! $lang['Td_color3'] = "Table Cell Colour 3";
  $lang['Td_class1'] = "Table Cell Class 1";
  $lang['Td_class2'] = "Table Cell Class 2";
***************
*** 655,661 ****
  $lang['fontsize2'] = "Font Size 2";
  $lang['fontsize3'] = "Font Size 3";
! $lang['fontcolor1'] = "Font Color 1";
! $lang['fontcolor2'] = "Font Color 2";
! $lang['fontcolor3'] = "Font Color 3";
  $lang['span_class1'] = "Span Class 1";
  $lang['span_class2'] = "Span Class 2";
--- 655,661 ----
  $lang['fontsize2'] = "Font Size 2";
  $lang['fontsize3'] = "Font Size 3";
! $lang['fontcolor1'] = "Font Colour 1";
! $lang['fontcolor2'] = "Font Colour 2";
! $lang['fontcolor3'] = "Font Colour 3";
  $lang['span_class1'] = "Span Class 1";
  $lang['span_class2'] = "Span Class 2";