Capitalisation, additional of one or two new options, removal of global prune option, addition of stats reset on admin index page

git-svn-id: file:///svn/phpbb/trunk@3708 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2003-03-24 19:03:16 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2003-03-24 19:03:16 +0000
commit: 12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5 (patch)
tree: f7dfb6342e98a1880cea3b6b9dfcf78b494a1730 /phpBB
parent: d1494cfd8cb7e11360bf4dd816511cf239069237 (diff)
download: forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.tar
forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.tar.gz
forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.tar.bz2
forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.tar.xz
forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.zip
5 files changed, 353 insertions, 242 deletions
diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php
index ed76cda85d..628223a686 100644
--- a/phpBB/adm/admin_board.php
+++ b/phpBB/adm/admin_board.php
@@ -121,9 +121,7 @@ page_header($user->lang[$l_title]);
 	</tr>
 <?php
 
-//
 // Output relevant page
-//
 switch ($mode)
 {
 	case 'cookie':
@@ -133,19 +131,19 @@ switch ($mode)
 
 ?>
 	<tr>
-		<td class="row1" width="50%"><?php echo $user->lang['Cookie_domain']; ?>: </td>
+		<td class="row1" width="50%"><?php echo $user->lang['COOKIE_DOMAIN']; ?>: </td>
 		<td class="row2"><input type="text" maxlength="255" name="cookie_domain" value="<?php echo $new['cookie_domain']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Cookie_name']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['COOKIE_NAME']; ?>: </td>
 		<td class="row2"><input type="text" maxlength="16" name="cookie_name" value="<?php echo $new['cookie_name']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Cookie_path']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['COOKIE_PATH']; ?>: </td>
 		<td class="row2"><input type="text" maxlength="255" name="cookie_path" value="<?php echo $new['cookie_path']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Cookie_secure']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Cookie_secure_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['COOKIE_SECURE']; ?>: <br /><span class="gensmall"><?php echo $user->lang['COOKIE_SECURE_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="cookie_secure" value="0"<?php echo $cookie_secure_no; ?> /><?php echo $user->lang['DISABLED']; ?>&nbsp; &nbsp;<input type="radio" name="cookie_secure" value="1"<?php echo $cookie_secure_yes; ?> /><?php echo $user->lang['ENABLED']; ?></td>
 	</tr>
 <?php
@@ -163,31 +161,31 @@ switch ($mode)
 
 ?>
 	<tr>
-		<td class="row1" width="50%"><?php echo $user->lang['Allow_local']; ?>: </td>
+		<td class="row1" width="50%"><?php echo $user->lang['ALLOW_LOCAL']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_avatar_local" value="1"<?php echo $avatars_local_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_avatar_local" value="0"<?php echo $avatars_local_no; ?>  /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_remote']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Allow_remote_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['ALLOW_REMOTE']; ?>: <br /><span class="gensmall"><?php echo $user->lang['ALLOW_REMOTE_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="allow_avatar_remote" value="1"<?php echo $avatars_remote_yes; ?>  /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_avatar_remote" value="0"<?php echo $avatars_remote_no; ?>  /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_upload']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ALLOW_UPLOAD']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_avatar_upload" value="1"<?php echo $avatars_upload_yes; ?>  /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_avatar_upload" value="0"<?php echo $avatars_upload_no; ?>  /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Max_filesize']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Max_filesize_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['MAX_FILESIZE']; ?>: <br /><span class="gensmall"><?php echo $user->lang['MAX_FILESIZE_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="<?php echo $new['avatar_filesize']; ?>" /> Bytes</td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Max_avatar_size']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Max_avatar_size_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['MAX_AVATAR_SIZE']; ?>: <br /><span class="gensmall"><?php echo $user->lang['MAX_AVATAR_SIZE_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="<?php echo $new['avatar_max_height']; ?>" /> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="<?php echo $new['avatar_max_width']; ?>"></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Avatar_storage_path']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Avatar_storage_path_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['AVATAR_STORAGE_PATH']; ?>: <br /><span class="gensmall"><?php echo $user->lang['AVATAR_STORAGE_PATH_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="<?php echo $new['avatar_path']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Avatar_gallery_path']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Avatar_gallery_path_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['AVATAR_GALLERY_PATH']; ?>: <br /><span class="gensmall"><?php echo $user->lang['AVATAR_GALLERY_PATH_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="20" maxlength="255" name="avatar_gallery_path" value="<?php echo $new['avatar_gallery_path']; ?>" /></td>
 	</tr>
 <?php
@@ -203,6 +201,9 @@ switch ($mode)
 		$override_user_style_yes = ($new['override_user_style']) ? 'checked="checked"' : '';
 		$override_user_style_no = (!$new['override_user_style']) ? 'checked="checked"' : '';
 
+		$dst_yes = ($new['board_dst']) ? 'checked="checked"' : '';
+		$dst_no = (!$new['board_dst']) ? 'checked="checked"' : '';
+
 		$topic_notify_yes = ($new['allow_topic_notify']) ? 'checked="checked"' : '';
 		$topic_notify_no = (!$new['allow_topic_notify']) ? 'checked="checked"' : '';
 
@@ -229,43 +230,47 @@ switch ($mode)
 
 ?>
 	<tr>
-		<td class="row1" width="50%"><?php echo $user->lang['Default_style']; ?></td>
-		<td class="row2"><?php echo $style_select; ?></td>
+		<td class="row1" width="50%"><?php echo $user->lang['DEFAULT_STYLE']; ?></td>
+		<td class="row2"><select name="default_style"><?php echo $style_select; ?></select></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Override_style']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Override_style_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['OVERRIDE_STYLE']; ?>: <br /><span class="gensmall"><?php echo $user->lang['OVERRIDE_STYLE_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="override_user_style" value="1" <?php echo $override_user_style_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="override_user_style" value="0" <?php echo $override_user_style_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Default_language']; ?>: </td>
-		<td class="row2"><?php echo $lang_select; ?></td>
+		<td class="row1"><?php echo $user->lang['DEFAULT_LANGUAGE']; ?>: </td>
+		<td class="row2"><select name="default_lang"><?php echo $lang_select; ?></select></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Date_format']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Date_format_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['DATE_FORMAT']; ?>: <br /><span class="gensmall"><?php echo $user->lang['DATE_FORMAT_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" name="default_dateformat" value="<?php echo $new['default_dateformat']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['System_timezone']; ?>: </td>
-		<td class="row2"><?php echo $timezone_select; ?></td>
+		<td class="row1"><?php echo $user->lang['SYSTEM_TIMEZONE']; ?>: </td>
+		<td class="row2"><select name="board_timezone"><?php echo $timezone_select; ?></select></td>
+	</tr>
+	<tr>
+		<td class="row1"><?php echo $user->lang['SYSTEM_DST']; ?>: </td>
+		<td class="row2"><input type="radio" name="board_dst" value="1" <?php echo $dst_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="board_dst" value="0" <?php echo $dst_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Char_limit']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Char_limit_explain']; ?></span</td>
+		<td class="row1"><?php echo $user->lang['CHAR_LIMIT']; ?>: <br /><span class="gensmall"><?php echo $user->lang['CHAR_LIMIT_EXPLAIN']; ?></span</td>
 		<td class="row2"><input type="text" size="4" maxlength="4" name="max_post_chars" value="<?php echo $new['max_post_chars']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Smilies_limit']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Smilies_limit_explain']; ?></span</td>
+		<td class="row1"><?php echo $user->lang['SMILIES_LIMIT']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SMILIES_LIMIT_EXPLAIN']; ?></span</td>
 		<td class="row2"><input type="text" size="4" maxlength="4" name="max_post_smilies" value="<?php echo $new['max_post_smilies']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_topic_notify']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ALLOW_TOPIC_NOTIFY']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_topic_notify" value="1" <?php echo $topic_notify_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_topic_notify" value="0" <?php echo $topic_notify_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_forum_notify']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ALLOW_FORUM_NOTIFY']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_forum_notify" value="1" <?php echo $forum_notify_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_forum_notify" value="0" <?php echo $forum_notify_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_name_change']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ALLOW_NAME_CHANGE']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_namechange" value="1" <?php echo $namechange_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_namechange" value="0" <?php echo $namechange_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
@@ -273,27 +278,27 @@ switch ($mode)
 		<td class="row2"><input type="radio" name="allow_attachments" value="1" <?php echo $attachments_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_attachments" value="0" <?php echo $attachments_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_HTML']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ALLOW_HTML']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_html" value="1" <?php echo $html_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_html" value="0" <?php echo $html_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allowed_tags']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Allowed_tags_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['ALLOWED_TAGS']; ?>: <br /><span class="gensmall"><?php echo $user->lang['ALLOWED_TAGS_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="30" maxlength="255" name="allow_html_tags" value="<?php echo $new['allow_html_tags']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_BBCode']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ALLOW_BBCODE']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_bbcode" value="1" <?php echo $bbcode_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_bbcode" value="0" <?php echo $bbcode_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_smilies']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ALLOW_SMILIES']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_smilies" value="1" <?php echo $smile_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_smilies" value="0" <?php echo $smile_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Allow_sig']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ALLOW_SIG']; ?>: </td>
 		<td class="row2"><input type="radio" name="allow_sig" value="1" <?php echo $sig_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_sig" value="0" <?php echo $sig_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Max_sig_length']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Max_sig_length_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['MAX_SIG_LENGTH']; ?>: <br /><span class="gensmall"><?php echo $user->lang['MAX_SIG_LENGTH_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="<?php echo $new['max_sig_chars']; ?>" /></td>
 	</tr>
 <?php
@@ -324,24 +329,20 @@ switch ($mode)
 
 ?>
 	<tr>
-		<td class="row1" width="50%"><?php echo $user->lang['Site_name']; ?>: </td>
+		<td class="row1" width="50%"><?php echo $user->lang['SITE_NAME']; ?>: </td>
 		<td class="row2"><input type="text" size="40" maxlength="255" name="sitename" value="<?php echo htmlentities($new['sitename']); ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Site_desc']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['SITE_DESC']; ?>: </td>
 		<td class="row2"><input type="text" size="40" maxlength="255" name="site_desc" value="<?php echo htmlentities($new['site_desc']); ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Board_disable']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Board_disable_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['BOARD_DISABLE']; ?>: <br /><span class="gensmall"><?php echo $user->lang['BOARD_DISABLE_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="board_disable" value="1" <?php echo $disable_board_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="board_disable" value="0" <?php echo $disable_board_no; ?> /> <?php echo $user->lang['NO']; ?><br /><input type="text" name="board_disable_msg" maxlength="255" size="40" value="<?php echo $new['board_disable_msg']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Enable_prune']; ?>: </td>
-		<td class="row2"><input type="radio" name="prune_enable" value="1" <?php echo $prune_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="prune_enable" value="0" <?php echo $prune_no; ?> /> <?php echo $user->lang['NO']; ?></td>
-	</tr>
-	<tr>
-		<td class="row1"><?php echo $user->lang['Acct_activation']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Acct_activation_explain']; ?></span></td>
-		<td class="row2"><input type="radio" name="require_activation" value="<?php echo USER_ACTIVATION_NONE; ?>" <?php echo $activation_none; ?> /><?php echo $user->lang['Acc_None']; ?>&nbsp; &nbsp;<input type="radio" name="require_activation" value="<?php echo USER_ACTIVATION_SELF; ?>" <?php echo $activation_user; ?> /><?php echo $user->lang['Acc_User']; ?>&nbsp; &nbsp;<input type="radio" name="require_activation" value="<?php echo USER_ACTIVATION_ADMIN; ?>" <?php echo $activation_admin; ?> /><?php echo $user->lang['Acc_Admin']; ?>&nbsp; &nbsp;<input type="radio" name="require_activation" value="<?php echo USER_ACTIVATION_DISABLE; ?>" <?php echo $activation_disable; ?> /><?php echo $user->lang['Acc_Disable']; ?></td>
+		<td class="row1"><?php echo $user->lang['ACC_ACTIVATION']; ?>: <br /><span class="gensmall"><?php echo $user->lang['ACC_ACTIVATION_EXPLAIN']; ?></span></td>
+		<td class="row2"><input type="radio" name="require_activation" value="<?php echo USER_ACTIVATION_NONE; ?>" <?php echo $activation_none; ?> /><?php echo $user->lang['ACC_NONE']; ?>&nbsp; &nbsp;<input type="radio" name="require_activation" value="<?php echo USER_ACTIVATION_SELF; ?>" <?php echo $activation_user; ?> /><?php echo $user->lang['ACC_USER']; ?>&nbsp; &nbsp;<input type="radio" name="require_activation" value="<?php echo USER_ACTIVATION_ADMIN; ?>" <?php echo $activation_admin; ?> /><?php echo $user->lang['ACC_ADMIN']; ?>&nbsp; &nbsp;<input type="radio" name="require_activation" value="<?php echo USER_ACTIVATION_DISABLE; ?>" <?php echo $activation_disable; ?> /><?php echo $user->lang['ACC_DISABLE']; ?></td>
 	</tr>
 	<tr>
 		<td class="row1"><?php echo $user->lang['VISUAL_CONFIRM']; ?>: <br /><span class="gensmall"><?php echo $user->lang['VISUAL_CONFIRM_EXPLAIN']; ?></span></td>
@@ -349,59 +350,63 @@ switch ($mode)
 	</tr>
 	
 	<tr>
-		<td class="row1"><?php echo $user->lang['Enable_COPPA']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Enable_COPPA_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['ENABLE_COPPA']; ?>: <br /><span class="gensmall"><?php echo $user->lang['ENABLE_COPPA_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="coppa_enable" value="1" <?php echo $coppa_enable_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="coppa_enable" value="0" <?php echo $coppa_enable_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['COPPA_fax']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['COPPA_FAX']; ?>: </td>
 		<td class="row2"><input type="text" size="25" maxlength="100" name="coppa_fax" value="<?php echo $new['coppa_fax']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['COPPA_mail']; ?>: <br /><span class="gensmall"><?php echo $user->lang['COPPA_mail_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['COPPA_MAIL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['COPPA_MAIL_EXPLAIN']; ?></span></td>
 		<td class="row2"><textarea name="coppa_mail" rows="5" cols="40"><?php echo $new['coppa_mail']; ?></textarea></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Private_Messaging']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['BOARD_PM']; ?>: <br /><span class="gensmall"><?php echo $user->lang['BOARD_PM_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="privmsg_disable" value="0" <?php echo $privmsg_on; ?> /><?php echo $user->lang['ENABLED']; ?>&nbsp; &nbsp;<input type="radio" name="privmsg_disable" value="1" <?php echo $privmsg_off; ?> /><?php echo $user->lang['DISABLED']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Boxes_max']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Boxes_max_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['BOXES_MAX']; ?>: <br /><span class="gensmall"><?php echo $user->lang['BOXES_MAX_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" maxlength="4" size="4" name="pm_max_boxes" value="<?php echo $new['pm_max_boxes']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Edit_time']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Edit_time_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['BOXES_LIMIT']; ?>: <br /><span class="gensmall"><?php echo $user->lang['BOXES_LIMIT_EXPLAIN']; ?></span></td>
+		<td class="row2"><input type="text" maxlength="4" size="4" name="pm_max_msgs" value="<?php echo $new['pm_max_msgs']; ?>" /></td>
+	</tr>
+	<tr>
+		<td class="row1"><?php echo $user->lang['EDIT_TIME']; ?>: <br /><span class="gensmall"><?php echo $user->lang['EDIT_TIME_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" maxlength="3" size="3" name="edit_time" value="<?php echo $new['edit_time']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Flood_Interval']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Flood_Interval_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['FLOOD_INTERVAL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['FLOOD_INTERVAL_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="<?php echo $new['flood_interval']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Search_Interval']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Search_Interval_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['SEARCH_INTERVAL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SEARCH_INTERVAL_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="3" maxlength="4" name="search_interval" value="<?php echo $new['search_interval']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Min_search_chars']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Min_search_chars_explain']; ?></span</td>
+		<td class="row1"><?php echo $user->lang['MIN_SEARCH_CHARS']; ?>: <br /><span class="gensmall"><?php echo $user->lang['MIN_SEARCH_CHARS_EXPLAIN']; ?></span</td>
 		<td class="row2"><input type="text" size="3" maxlength="3" name="min_search_chars" value="<?php echo $new['min_search_chars']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Max_search_chars']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Max_search_chars_explain']; ?></span</td>
+		<td class="row1"><?php echo $user->lang['MAX_SEARCH_CHARS']; ?>: <br /><span class="gensmall"><?php echo $user->lang['MAX_SEARCH_CHARS_EXPLAIN']; ?></span</td>
 		<td class="row2"><input type="text" size="3" maxlength="3" name="max_search_chars" value="<?php echo $new['max_search_chars']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Topics_per_page']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['TOPICS_PER_PAGE']; ?>: </td>
 		<td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="<?php echo $new['topics_per_page']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Posts_per_page']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['POSTS_PER_PAGE']; ?>: </td>
 		<td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="<?php echo $new['posts_per_page']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Hot_threshold']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['HOT_THRESHOLD']; ?>: </td>
 		<td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="<?php echo $new['hot_threshold']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Max_poll_options']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['MAX_POLL_OPTIONS']; ?>: </td>
 		<td class="row2"><input type="text" name="max_poll_options" size="4" maxlength="4" value="<?php echo $new['max_poll_options']; ?>" /></td>
 	</tr>
 <?php
@@ -421,27 +426,31 @@ switch ($mode)
 
 ?>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Enable_email']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Enable_email_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['ENABLE_EMAIL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['ENABLE_EMAIL_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="email_enable" value="1" <?php echo $email_yes; ?> /> <?php echo $user->lang['ENABLED']; ?>&nbsp;&nbsp;<input type="radio" name="email_enable" value="0" <?php echo $email_no; ?> /> <?php echo $user->lang['DISABLED']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Board_email_form']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Board_email_form_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['BOARD_EMAIL_FORM']; ?>: <br /><span class="gensmall"><?php echo $user->lang['BOARD_EMAIL_FORM_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="board_email_form" value="1" <?php echo $board_email_form_yes; ?> /> <?php echo $user->lang['ENABLED']; ?>&nbsp;&nbsp;<input type="radio" name="board_email_form" value="0" <?php echo $board_email_form_no; ?> /> <?php echo $user->lang['DISABLED']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1" width="50%"><?php echo $user->lang['Admin_email']; ?>: </td>
+		<td class="row1" width="50%"><?php echo $user->lang['ADMIN_EMAIL']; ?>: </td>
 		<td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="<?php echo $new['board_email']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Email_sig']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Email_sig_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['EMAIL_SIG']; ?>: <br /><span class="gensmall"><?php echo $user->lang['EMAIL_SIG_EXPLAIN']; ?></span></td>
 		<td class="row2"><textarea name="board_email_sig" rows="5" cols="30"><?php echo $new['board_email_sig']; ?></textarea></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Use_SMTP']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Use_SMTP_explain']; ?></span></td>
+		<td class="row1" width="50%"><?php echo $user->lang['CONTACT_EMAIL']; ?>: <br /><span class="gensmall"><?php echo $user->lang['CONTACT_EMAIL_EXPLAIN']; ?></span></td>
+		<td class="row2"><input type="text" size="25" maxlength="100" name="board_contact" value="<?php echo $new['board_contact']; ?>" /></td>
+	</tr>
+	<tr>
+		<td class="row1"><?php echo $user->lang['USE_SMTP']; ?>: <br /><span class="gensmall"><?php echo $user->lang['USE_SMTP_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="radio" name="smtp_delivery" value="1" <?php echo $smtp_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="smtp_delivery" value="0" <?php echo $smtp_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['SMTP_server']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['SMTP_SERVER']; ?>: </td>
 		<td class="row2"><input type="text" name="smtp_host" value="<?php echo $new['smtp_host']; ?>" size="25" maxlength="50" /></td>
 	</tr>
 	<tr>
@@ -449,11 +458,11 @@ switch ($mode)
 		<td class="row2"><input type="text" name="smtp_port" value="<?php echo $new['smtp_port']; ?>" size="4" maxlength="5" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['SMTP_username']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SMTP_username_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['SMTP_USERNAME']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SMTP_USERNAME_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" name="smtp_username" value="<?php echo $new['smtp_username']; ?>" size="25" maxlength="255" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['SMTP_password']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SMTP_password_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['SMTP_PASSWORD']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SMTP_PASSWORD_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="password" name="smtp_password" value="<?php echo $new['smtp_password']; ?>" size="25" maxlength="255" /></td>
 	</tr>
 <?php
@@ -467,47 +476,54 @@ switch ($mode)
 		$ip_classb = ($new['ip_check'] == 2) ? 'checked="checked"' : '';
 		$ip_none = ($new['ip_check'] == 0) ? 'checked="checked"' : '';
 
+		$browser_yes = ($new['browser_check']) ? 'checked="checked"' : '';
+		$browser_no = (!$new['browser_check']) ? 'checked="checked"' : '';
+
 		$gzip_yes = ($new['gzip_compress']) ? 'checked="checked"' : '';
 		$gzip_no = (!$new['gzip_compress']) ? 'checked="checked"' : '';
 ?>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Server_name']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Server_name_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['SERVER_NAME']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SERVER_NAME_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" maxlength="255" size="40" name="server_name" value="<?php echo $new['server_name']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Server_port']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Server_port_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['SERVER_PORT']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SERVER_PORT_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" maxlength="5" size="5" name="server_port" value="<?php echo $new['server_port']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Script_path']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Script_path_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['SCRIPT_PATH']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SCRIPT_PATH_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" maxlength="255" name="script_path" value="<?php echo $new['script_path']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['IP_valid']; ?>: <br /><span class="gensmall"><?php echo $user->lang['IP_valid_explain']; ?></span></td>
-		<td class="row2"><input type="radio" name="ip_check" value="4" <?php echo $ip_all; ?> /> <?php echo $user->lang['All']; ?>&nbsp;&nbsp;<input type="radio" name="ip_check" value="3" <?php echo $ip_classc; ?> /> <?php echo $user->lang['Class_C']; ?>&nbsp;&nbsp;<input type="radio" name="ip_check" value="2" <?php echo $ip_classb; ?> /> <?php echo $user->lang['Class_B']; ?>&nbsp;&nbsp;<input type="radio" name="ip_check" value="0" <?php echo $ip_none; ?> /> <?php echo $user->lang['NONE']; ?>&nbsp;&nbsp;</td>
+		<td class="row1"><?php echo $user->lang['IP_VALID']; ?>: <br /><span class="gensmall"><?php echo $user->lang['IP_VALID_EXPLAIN']; ?></span></td>
+		<td class="row2"><input type="radio" name="ip_check" value="4" <?php echo $ip_all; ?> /> <?php echo $user->lang['ALL']; ?>&nbsp;&nbsp;<input type="radio" name="ip_check" value="3" <?php echo $ip_classc; ?> /> <?php echo $user->lang['CLASS_C']; ?>&nbsp;&nbsp;<input type="radio" name="ip_check" value="2" <?php echo $ip_classb; ?> /> <?php echo $user->lang['CLASS_B']; ?>&nbsp;&nbsp;<input type="radio" name="ip_check" value="0" <?php echo $ip_none; ?> /> <?php echo $user->lang['NONE']; ?>&nbsp;&nbsp;</td>
+	</tr>
+	<tr>
+		<td class="row1"><?php echo $user->lang['BROWSER_VALID']; ?>: <br /><span class="gensmall"><?php echo $user->lang['BROWSER_VALID_EXPLAIN']; ?></span></td>
+		<td class="row2"><input type="radio" name="browser_check" value="1" <?php echo $browser_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="browser_check" value="0" <?php echo $browser_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Limit_load']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Limit_load_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['LIMIT_LOAD']; ?>: <br /><span class="gensmall"><?php echo $user->lang['LIMIT_LOAD_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="4" maxlength="4" name="limit_load" value="<?php echo $new['limit_load']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Session_length']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['SESSION_LENGTH']; ?>: </td>
 		<td class="row2"><input type="text" maxlength="5" size="5" name="session_length" value="<?php echo $new['session_length']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Limit_sessions']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Limit_sessions_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['LIMIT_SESSIONS']; ?>: <br /><span class="gensmall"><?php echo $user->lang['LIMIT_SESSIONS_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="4" maxlength="4" name="active_sessions" value="<?php echo $new['active_sessions']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Enable_gzip']; ?>: </td>
+		<td class="row1"><?php echo $user->lang['ENABLE_GZIP']; ?>: </td>
 		<td class="row2"><input type="radio" name="gzip_compress" value="1" <?php echo $gzip_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="gzip_compress" value="0" <?php echo $gzip_no; ?> /> <?php echo $user->lang['NO']; ?></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Smilies_path']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Smilies_path_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['SMILIES_PATH']; ?>: <br /><span class="gensmall"><?php echo $user->lang['SMILIES_PATH_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="<?php echo $new['smilies_path']; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><?php echo $user->lang['Icons_path']; ?>: <br /><span class="gensmall"><?php echo $user->lang['Icons_path_explain']; ?></span></td>
+		<td class="row1"><?php echo $user->lang['ICONS_PATH']; ?>: <br /><span class="gensmall"><?php echo $user->lang['ICONS_PATH_EXPLAIN']; ?></span></td>
 		<td class="row2"><input type="text" size="20" maxlength="255" name="icons_path" value="<?php echo $new['icons_path']; ?>" /></td>
 	</tr>
 <?php
@@ -538,7 +554,7 @@ switch ($mode)
 
 ?>
 	<tr>
-		<td class="row1" width="50%"><?php echo $user->lang['Auth_method']; ?>:</td>
+		<td class="row1" width="50%"><?php echo $user->lang['AUTH_METHOD']; ?>:</td>
 		<td class="row2"><select name="auth_method"><?php echo $auth_select; ?></select></td>
 	</tr>
 <?php
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 454d6e15eb..ef478deffb 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -177,11 +177,63 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
 		{
 			trigger_error($user->lang['NO_ADMIN']);
 		}
+	}
+	else if (isset($_POST['online']))
+	{
+		if (!$auth->acl_get('a_defaults'))
+		{
+			trigger_error($user->lang['NO_ADMIN']);
+		}
 
+		set_config('record_online_users', 1);
+		set_config('record_online_date', time());
+		add_log('admin', 'LOG_RESET_ONLINE');
 	}
-	else if (isset($_POST['resetonline']))
+	else if (isset($_POST['stats']))
 	{
+		if (!$auth->acl_get('a_defaults'))
+		{
+			trigger_error($user->lang['NO_ADMIN']);
+		}
 
+		$sql = "SELECT COUNT(post_id) AS stat 
+			FROM " . POSTS_TABLE . "
+			WHERE post_approved = 1";
+		$result = $db->sql_query($sql);
+
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+		set_config('num_posts', $row['stat']);
+
+		$sql = "SELECT COUNT(topic_id) AS stat
+			FROM " . TOPICS_TABLE . "
+			WHERE topic_approved = 1";
+		$result = $db->sql_query($sql);
+
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+		set_config('num_topics', $row['stat']);
+
+		$sql = "SELECT COUNT(user_id) AS stat
+			FROM " . USERS_TABLE . "
+			WHERE user_active = 1";
+		$result = $db->sql_query($sql);
+
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+		set_config('num_users', $row['stat']);
+
+		add_log('admin', 'LOG_RESYNC_STATS');
+	}
+	else if (isset($_POST['date']))
+	{
+		if (!$auth->acl_get('a_defaults'))
+		{
+			trigger_error($user->lang['NO_ADMIN']);
+		}
+
+		set_config('board_startdate', time() - 1);
+		add_log('admin', 'LOG_RESET_DATE');
 	}
 
 	// Get forum statistics
@@ -336,7 +388,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
 
 <h1><?php echo $user->lang['FORUM_STATS']; ?></h1>
 
-<table class="bg" width="100%" cellpadding="4" cellspacing="1" border="0">
+<form name="statistics" method="post" action="index.<?php echo $phpEx . $SID; ?>&amp;pane=right"><table class="bg" width="100%" cellpadding="4" cellspacing="1" border="0">
 	<tr>
 		<th width="25%" nowrap="nowrap" height="25"><?php echo $user->lang['STATISTIC']; ?></th>
 		<th width="25%"><?php echo $user->lang['VALUE']; ?></th>
@@ -373,10 +425,10 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
 		<td class="row1" nowrap="nowrap"><?php echo $user->lang['GZIP_COMPRESSION']; ?>:</td>
 		<td class="row2"><b><?php echo ($config['gzip_compress']) ? $user->lang['ON'] : $user->lang['OFF']; ?></b></td>
 	</tr>
-	<!-- tr>
-		<td class="row1" colspan="4"><?php echo sprintf($user->lang['Record_online_users'], $config['record_online_users'], $user->format_date($config['record_online_date'])); ?></td>
-	</tr -->
-</table>
+	<tr>
+		<td class="cat" colspan="4" align="right"><input class="liteoption" type="submit" name="online" value="<?php echo $user->lang['RESET_ONLINE']; ?>" /> &nbsp;<input class="liteoption" type="submit" name="date" value="<?php echo $user->lang['RESET_DATE']; ?>" /> &nbsp;<input class="liteoption" type="submit" name="stats" value="<?php echo $user->lang['RESYNC_STATS']; ?>" />&nbsp;</td>
+	</tr>
+</table></form>
 
 <h1><?php echo $user->lang['ADMIN_LOG']; ?></h1>
 
diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql
index ada475b27a..c76239cf17 100644
--- a/phpBB/install/schemas/mysql_basic.sql
+++ b/phpBB/install/schemas/mysql_basic.sql
@@ -29,6 +29,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_uploa
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_dst','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','30');
@@ -38,7 +39,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','imag
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path','images/icons');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable','1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
@@ -61,7 +61,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes','4')
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs','50');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('edit_time','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','youraddress@yourdomain.com');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','address@yourdomain.com');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact','contact@yourdomain.com');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port','25');
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 936daff77d..07868231dd 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -42,6 +42,17 @@ CREATE TABLE phpbb_attach_desc (
 
 # --------------------------------------------------------
 #
+# Table structure for table `phpbb_auth_dependencies`
+#
+CREATE TABLE phpbb_auth_dependencies (
+  auth_option_id smallint(5) unsigned NOT NULL default '0',
+  auth_depend text,
+  PRIMARY KEY (auth_option_id)
+);
+
+
+# --------------------------------------------------------
+#
 # Table structure for table `phpbb_auth_groups`
 #
 CREATE TABLE phpbb_auth_groups (
@@ -204,19 +215,19 @@ CREATE TABLE phpbb_forums (
    forum_parents text,
    forum_name varchar(150) NOT NULL,
    forum_desc text,
+   forum_password varchar(32) DEFAULT '' NOT NULL, 
    forum_style tinyint(4) UNSIGNED,
    forum_image varchar(50),
    forum_status tinyint(4) DEFAULT '0' NOT NULL,
    forum_postable tinyint(4) DEFAULT '0' NOT NULL,
    forum_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    forum_topics mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+   forum_last_topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    forum_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    forum_last_poster_id mediumint(8) DEFAULT '0' NOT NULL,
    forum_last_post_time int(11) DEFAULT '0' NOT NULL,
    forum_last_poster_name varchar(30),
    display_on_index tinyint(1) DEFAULT '1' NOT NULL,
-   enable_post_count tinyint(1) DEFAULT '1' NOT NULL,
-   enable_moderate tinyint(1) DEFAULT '0' NOT NULL, 
    enable_icons tinyint(1) DEFAULT '1' NOT NULL, 
    enable_prune tinyint(1) DEFAULT '0' NOT NULL, 
    prune_next int(11) UNSIGNED,
@@ -249,6 +260,7 @@ CREATE TABLE phpbb_groups (
    group_id mediumint(8) NOT NULL auto_increment,
    group_type tinyint(4) DEFAULT '1' NOT NULL,
    group_name varchar(40) NOT NULL,
+   group_display tinyint(1) DEFAULT '0' NOT NULL, 
    group_avatar varchar(100),
    group_avatar_type tinyint(4),
    group_rank int(11) DEFAULT '0',
@@ -283,6 +295,22 @@ CREATE TABLE phpbb_icons (
    PRIMARY KEY (icons_id)
 );
 
+
+# --------------------------------------------------------
+#
+# Table structure for table 'phpbb_lang'
+#
+CREATE TABLE phpbb_lang (
+   lang_id tinyint(4) UNSIGNED NOT NULL auto_increment,
+   lang_iso varchar(5) NOT NULL, 
+   lang_dir varchar(30) NOT NULL, 
+   lang_english_name varchar(30), 
+   lang_local_name varchar(100), 
+   lang_author varchar(100), 
+   PRIMARY KEY (lang_id)
+);
+
+
 # --------------------------------------------------------
 #
 # Table structure for table 'phpbb_lastread'
@@ -296,6 +324,7 @@ CREATE TABLE phpbb_lastread (
    PRIMARY KEY  (user_id,topic_id)
 );
 
+
 # --------------------------------------------------------
 #
 # Table structure for table 'phpbb_log_moderator'
@@ -311,7 +340,7 @@ CREATE TABLE phpbb_log_moderator (
   log_data text,
   PRIMARY KEY (log_id),
   KEY forum_id (forum_id),
-  KEY topic_id (forum_id),
+  KEY topic_id (topic_id),
   KEY user_id (user_id)
 );
 
@@ -460,8 +489,8 @@ CREATE TABLE phpbb_ranks (
 CREATE TABLE phpbb_ratings (
   post_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
   user_id tinyint(4) UNSIGNED UNSIGNED NOT NULL DEFAULT '0',
-  rating tinyint(4) NOT NULL, 
-  KEY post_id (post_id),
+  rating tinyint(4) NOT NULL,  
+  PRIMARY KEY (post_id, user_id), 
   KEY user_id (user_id)
 );
 
@@ -595,7 +624,7 @@ CREATE TABLE phpbb_styles_template (
    template_path varchar(50) NOT NULL,
    poll_length smallint(5) UNSIGNED NOT NULL,
    pm_box_length smallint(5) UNSIGNED NOT NULL,
-   compile_crc text,
+   compile_crc text, 
    PRIMARY KEY (template_id)
 );
 
@@ -787,7 +816,7 @@ CREATE TABLE phpbb_users (
    user_startpage varchar(100) DEFAULT '',
    user_colour varchar(6) DEFAULT '' NOT NULL,
    user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-   user_lang varchar(50),
+   user_lang varchar(30),
    user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
    user_dst tinyint(1) DEFAULT '0' NOT NULL,
    user_dateformat varchar(15) DEFAULT 'd M Y H:i' NOT NULL,
@@ -827,10 +856,10 @@ CREATE TABLE phpbb_users (
    user_yim varchar(255),
    user_msnm varchar(255),
    user_website varchar(100),
-   user_occ varchar(100),
-   user_interests varchar(255),
    user_actkey varchar(32),
    user_newpasswd varchar(32),
+   user_occ varchar(100),
+   user_interests varchar(255),
    PRIMARY KEY (user_id)
 );
 
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 1d2a46e491..bf48953577 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -29,19 +29,19 @@ $lang = array_merge($lang, array(
 	'FORUM_INDEX'	=> 'Forum Index',
 	'ADMIN_INDEX'	=> 'Admin Index',
 
-	'PERMISSIONS'	=> 'Permissions',
 	'MANAGE'		=> 'Manage',
 	'ADD'			=> 'Add', 
+	'PERMISSIONS'	=> 'Permissions', 
 
-	'DB_CAT'		=> 'Database Admin', 
+	'DB_CAT'		=> 'Database', 
 	'DB_BACKUP'		=> 'DB Backup',
 	'DB_RESTORE'	=> 'DB Restore',
 	'SEARCH_INDEX'	=> 'Search indexing', 
 
-	'FORUM_CAT'	=> 'Forum Admin',
+	'FORUM_CAT'	=> 'Forums',
 	'PRUNE'		=> 'Pruning',
 
-	'GENERAL_CAT'		=> 'General Admin',
+	'GENERAL_CAT'		=> 'General',
 	'AUTH_SETTINGS'		=> 'Authentication',
 	'AVATAR_SETTINGS'	=> 'Avatar Settings',
 	'BASIC_CONFIG'		=> 'Basic Configuration',
@@ -53,26 +53,27 @@ $lang = array_merge($lang, array(
 	'SERVER_SETTINGS'	=> 'Server Settings',
 	'EVENTS'			=> 'Events', 
 	'CRON'				=> 'Cronjobs', 
+	'PHP_INFO'			=> 'PHP Information', 
 
-	'GROUP_CAT'	=> 'Group Admin',
+	'GROUP_CAT'	=> 'Usergroups',
 	'CREATE'	=> 'Create',
 
-	'LOG_CAT'	=> 'Log Admin',
+	'LOG_CAT'	=> 'Logging',
 	'ADMIN_LOGS'=> 'Admin Log',
 	'MOD_LOGS'	=> 'Moderator Log',
 
-	'POST_CAT'		=> 'Posting Admin',
+	'POST_CAT'		=> 'Posting',
 	'SMILE'			=> 'Smilies',
 	'ICONS'			=> 'Icons',
 	'WORD_CENSOR'	=> 'Word Censors',
 
-	'STYLE_CAT'		=> 'Styles Admin',
+	'STYLE_CAT'		=> 'Styles',
 	'EDIT_STYLE'	=> 'Edit style', 
 	'EDIT_TEMPLATE'	=> 'Edit template', 
 	'EDIT_THEME'	=> 'Edit theme', 
 	'EDIT_IMAGESET'	=> 'Edit imageset', 
 
-	'USER_CAT'		=> 'User Admin', 
+	'USER_CAT'		=> 'Users', 
 	'BAN_EMAILS'	=> 'Ban Emails',
 	'BAN_IPS'		=> 'Ban IPs',
 	'BAN_USERS'		=> 'Ban Usernames',
@@ -121,6 +122,9 @@ $lang = array_merge($lang, array(
 	'log_prune_user_deac'	=> '<b>Users Deactivated</b> => %s',
 	'log_prune_user_del_del'=> '<b>Users Pruned and Posts Deleted</b> => %s',
 	'log_prune_user_del_anon'=> '<b>Users Pruned and Posts Retained</b> => %s',
+	'LOG_RESYNC_STATS'		=> '<b>Post, topic and user stats reset</b>', 
+	'LOG_RESET_DATE'		=> '<b>Board start date reset</b>', 
+	'LOG_RESET_ONLINE'		=> '<b>Most users online reset</b>', 
 
 	'RUN_HOW'	=> 'When to run', 
 	'RUN_AS_NOW'=> 'Run now',
@@ -146,6 +150,9 @@ $lang = array_merge($lang, array(
 	'NOT_AVAILABLE'		=> 'Not available',
 	'ON'	=> 'ON',
 	'OFF'	=> 'OFF',
+	'RESET_ONLINE'		=> 'Reset Online', 
+	'RESET_DATE'		=> 'Reset Date', 
+	'RESYNC_STATS'		=> 'Resync Stats', 
 	'INACTIVE_USERS'		=> 'Inactive Users',
 	'INACTIVE_USERS_EXPLAIN'=> 'This is a list of users who have registered but whos accounts are inactive. You can activate, delete or remind (by sending an email) these users if you wish.',
 	'NO_INACTIVE_USERS'		=> 'No inactive users',
@@ -361,147 +368,153 @@ $lang = array_merge($lang, array(
 
 
 	'COOKIE_SETTINGS_EXPLAIN' => 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
-	'Cookie_domain' => 'Cookie domain',
-	'Cookie_name' => 'Cookie name',
-	'Cookie_path' => 'Cookie path',
-	'Cookie_secure' => 'Cookie secure',
-	'Cookie_secure_explain' => 'If your server is running via SSL set this to enabled else leave as disabled',
-	'Session_length' => 'Session length [ seconds ]',
-
-
-	'AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that filesize limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
-	'Allow_local' => 'Enable gallery avatars',
-	'Allow_remote' => 'Enable remote avatars',
-	'Allow_remote_explain' => 'Avatars linked to from another website',
-	'Allow_upload' => 'Enable avatar uploading',
-	'Max_filesize' => 'Maximum Avatar File Size',
-	'Max_filesize_explain' => 'For uploaded avatar files',
-	'Max_avatar_size' => 'Maximum Avatar Dimensions',
-	'Max_avatar_size_explain' => '(Height x Width in pixels)',
-	'Avatar_storage_path' => 'Avatar Storage Path',
-	'Avatar_storage_path_explain' => 'Path under your phpBB root dir, e.g. images/avatars',
-	'Avatar_gallery_path' => 'Avatar Gallery Path',
-	'Avatar_gallery_path_explain' => 'Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery',
-
-
-	'SERVER_SETTINGS_EXPLAIN' => 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in emails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
-	'Server_name' => 'Domain Name',
-	'Server_name_explain' => 'The domain name this board runs from',
-	'Script_path' => 'Script path',
-	'Script_path_explain' => 'The path where phpBB2 is located relative to the domain name',
-	'Server_port' => 'Server Port',
-	'Server_port_explain' => 'The port your server is running on, usually 80, only change if different',
-
-
-	'EMAIL_SETTINGS_EXPLAIN' => 'This information is used when the board sends emails to your users. Please ensure the email address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) email service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary), do not specify any old name here! If the server requires authentication (and only if it does) enter the necessary username and password. Please note only basic authentication is offered, different authentication implementations are not currently supported.',
-	'Enable_email' => 'Enable board-wide emails',
-	'Enable_email_explain' => 'If this is set to disabled no emails will be sent by the board at all.',
-	'Board_email_form' => 'Users send email via board',
-	'Board_email_form_explain' => 'This function keeps email addresses completely private.',
-	'Admin_email' => 'Admin Email Address',
-	'Email_sig' => 'Email Signature',
-	'Email_sig_explain' => 'This text will be attached to all emails the board sends',
-	'Use_SMTP' => 'Use SMTP Server for email',
-	'Use_SMTP_explain' => 'Say yes if you want or have to send email via a named server instead of the local mail function',
-	'SMTP_server' => 'SMTP Server Address',
-	'SMTP_PORT' => 'SMTP Server Port',
-	'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different port',
-	'SMTP_username' => 'SMTP Username',
-	'SMTP_username_explain' => 'Only enter a username if your smtp server requires it',
-	'SMTP_password' => 'SMTP Password',
-	'SMTP_password_explain' => 'Only enter a password if your smtp server requires it',
-	'Click_return_config' => 'Click %sHere%s to return to General Configuration',
-
-
-	'BOARD_SETTINGS_EXPLAIN' => 'Here you can determine the basic operation of your board, from the site name through user registration to private messaging.',
-	'Site_name' => 'Site name',
-	'Site_desc' => 'Site description',
-	'Board_disable' => 'Disable board',
-	'Board_disable_explain' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
-	'VISUAL_CONFIRM' => 'Enable visual confirmation',
-	'VISUAL_CONFIRM_EXPLAIN' => 'Requires new users enter a random code matching an image to help prevent mass registrations.',
-	
-
-	'IP_valid' => 'Session IP validation',
-	'IP_valid_explain' => 'Determines how much of the users IP is used to validate a session; All compares the complete address, A.B.C the first x.x.x, A.B the first x.x, None disables checking.',
-	'All' => 'All',
-	'Class_C' => 'A.B.C',
-	'Class_B' => 'A.B',
-	'Limit_load' => 'Limit system load',
-	'Limit_load_explain' => 'If the 1 minute system load exceeds this value the board will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
-	'Limit_sessions' => 'Limit sessions',
-	'Limit_sessions_explain' => 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',
-	'Acct_activation' => 'Enable account activation',
-	'Acct_activation_explain' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
-	'Acc_None' => 'None',
-	'Acc_User' => 'User',
-	'Acc_Admin' => 'Admin',
-	'Acc_Disable' => 'Disable',
-	'Enable_gzip' => 'Enable GZip Compression',
-	'Enable_prune' => 'Enable Forum Pruning',
-	'Enable_COPPA' => 'Enable COPPA',
-	'Enable_COPPA_explain' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA act.',
-	'COPPA_fax' => 'COPPA Fax Number',
-	'COPPA_mail' => 'COPPA Mailing Address',
-	'COPPA_mail_explain' => 'This is the mailing address where parents will send COPPA registration forms',
-	'Boxes_max' => 'Max number of message boxes',
-	'Boxes_max_explain' => 'Users can create this many private messaging boxes.',
-	'Boxes_limit' => 'Max messages per box',
-	'Boxes_limit_explain' => 'Users are limited to no more than this many messages in each of their private message boxes.',
-	'Edit_time' => 'Limit editing time',
-	'Edit_time_explain' => 'Limits the time available to edit a new post, zero equals infinity',
-	'Flood_Interval' => 'Flood Interval',
-	'Flood_Interval_explain' => 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.',
-	'Search_Interval' => 'Search Flood Interval',
-	'Search_Interval_explain' => 'Number of seconds users must wait between searches.',
-	'Min_search_chars' => 'Min characters indexed by search',
-	'Min_search_chars_explain' => 'Words with at least this many characters will be indexed for searching.',
-	'Max_search_chars' => 'Max characters indexed by search',
-	'Max_search_chars_explain' => 'Words with no more than this many characters will be indexed for searching.',
-
-
-	'AUTH_SETTINGS_EXPLAIN' => 'phpBB2 supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
-	'Auth_method' => 'Select an authentication method',
-	'LDAP_server' => 'LDAP server name',
-	'LDAP_server_explain' => 'If using LDAP this is the name or IP address of the server.',
-	'LDAP_dn' => 'LDAP base dn',
-	'LDAP_dn_explain' => 'This is the <i>distinguished name</i>, locating the user information, e.g. o=My Company,c=US',
-	'LDAP_uid' => 'LDAP uid',
-	'LDAP_uid_explain' => 'This is the key under which to search for a given login identity, e.g. uid, sn, etc.',
-
-
-	'BOARD_DEFAULTS_EXPLAIN' => 'These settings allow you to define a number of default or global settings used by the board. For example, to disable the use of HTML across the entire board alter the relevant setting below. This data is also used for new user registrations and (where relevant) guest users.',
-	'Max_poll_options' => 'Max number of poll options',
-	'Topics_per_page' => 'Topics Per Page',
-	'Posts_per_page' => 'Posts Per Page',
-	'Hot_threshold' => 'Posts for Popular Threshold',
-	'Default_style' => 'Default Style',
-	'Override_style' => 'Override user style',
-	'Override_style_explain' => 'Replaces users style with the default',
-	'Default_language' => 'Default Language',
-	'Date_format' => 'Date Format',
-	'System_timezone' => 'System Timezone',
-	'Char_limit' => 'Max characters per post',
-	'Char_limit_explain' => 'Set to 0 for unlimited characters.',
-	'Allow_topic_notify' => 'Allow Topic Watching',
-	'Allow_forum_notify' => 'Allow Forum Watching',
-	'Allow_HTML' => 'Allow HTML',
-	'Allow_BBCode' => 'Allow BBCode',
-	'Allowed_tags' => 'Allowed HTML tags',
-	'Allowed_tags_explain' => 'Separate tags with commas',
-	'Allow_smilies' => 'Allow Smilies',
-	'Smilies_path' => 'Smilies storage path',
-	'Smilies_path_explain' => 'Path under your phpBB root dir, e.g. images/smilies',
-	'Smilies_limit' => 'Max smilies per post',
-	'Smilies_limit_explain' => 'Set to 0 for unlimited smilies.',
-	'Icons_path' => 'Post icons storage path',
-	'Icons_path_explain' => 'Path under your phpBB root dir, e.g. images/icons',
-	'Allow_sig' => 'Allow Signatures',
-	'Max_sig_length' => 'Maximum signature length',
-	'Max_sig_length_explain' => 'Maximum number of characters in user signatures',
-	'Allow_name_change' => 'Allow Username changes',
-	'ALLOW_ATTACHMENTS' => 'Allow Attachments',
-
+	'COOKIE_DOMAIN' => 'Cookie domain',
+	'COOKIE_NAME' => 'Cookie name',
+	'COOKIE_PATH' => 'Cookie path',
+	'COOKIE_SECURE' => 'Cookie secure',
+	'COOKIE_SECURE_EXPLAIN' => 'If your server is running via SSL set this to enabled else leave as disabled',
+
+
+	'AVATAR_SETTINGS_EXPLAIN'	=> 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that filesize limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
+	'ALLOW_LOCAL'				=> 'Enable gallery avatars',
+	'ALLOW_REMOTE'				=> 'Enable remote avatars',
+	'ALLOW_REMOTE_EXPLAIN'		=> 'Avatars linked to from another website',
+	'ALLOW_UPLOAD'				=> 'Enable avatar uploading',
+	'MAX_FILESIZE'				=> 'Maximum Avatar File Size',
+	'MAX_FILESIZE_EXPLAIN'		=> 'For uploaded avatar files',
+	'MAX_AVATAR_SIZE'			=> 'Maximum Avatar Dimensions',
+	'MAX_AVATAR_SIZE_EXPLAIN'	=> '(Height x Width in pixels)',
+	'AVATAR_STORAGE_PATH'		=> 'Avatar Storage Path',
+	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root dir, e.g. images/avatars',
+	'AVATAR_GALLERY_PATH'			=> 'Avatar Gallery Path',
+	'AVATAR_GALLERY_PATH_EXPLAIN'	=> 'Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery',
+
+
+	'SERVER_SETTINGS_EXPLAIN'	=> 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in emails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
+	'SERVER_NAME'				=> 'Domain Name',
+	'SERVER_NAME_EXPLAIN'		=> 'The domain name this board runs from',
+	'SCRIPT_PATH'				=> 'Script path',
+	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB2 is located relative to the domain name',
+	'SERVER_PORT'				=> 'Server Port',
+	'SERVER_PORT_EXPLAIN'		=> 'The port your server is running on, usually 80, only change if different',
+	'IP_VALID'					=> 'Session IP validation',
+	'IP_VALID_EXPLAIN'			=> 'Determines how much of the users IP is used to validate a session; All compares the complete address, A.B.C the first x.x.x, A.B the first x.x, None disables checking.',
+	'ALL'						=> 'All',
+	'CLASS_C'					=> 'A.B.C',
+	'CLASS_B'					=> 'A.B', 
+	'BROWSER_VALID'				=> 'Validate browser', 
+	'BROWSER_VALID_EXPLAIN'		=> 'Enables browser validation for each session inproving security.', 
+	'LIMIT_LOAD'				=> 'Limit system load',
+	'LIMIT_LOAD_EXPLAIN'		=> 'If the 1 minute system load exceeds this value the board will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
+	'SESSION_LENGTH'			=> 'Session length [ seconds ]',
+	'LIMIT_SESSIONS'			=> 'Limit sessions',
+	'LIMIT_SESSIONS_EXPLAIN'	=> 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',
+	'ENABLE_GZIP'				=> 'Enable GZip Compression',
+	'SMILIES_PATH'				=> 'Smilies storage path',
+	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root dir, e.g. images/smilies',
+	'ICONS_PATH'				=> 'Post icons storage path',
+	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root dir, e.g. images/icons',
+
+
+	'EMAIL_SETTINGS_EXPLAIN'	=> 'This information is used when the board sends emails to your users. Please ensure the email address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) email service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary), do not specify any old name here! If the server requires authentication (and only if it does) enter the necessary username and password. Please note only basic authentication is offered, different authentication implementations are not currently supported.',
+	'ENABLE_EMAIL'				=> 'Enable board-wide emails',
+	'ENABLE_EMAIL_EXPLAIN'		=> 'If this is set to disabled no emails will be sent by the board at all.',
+	'BOARD_EMAIL_FORM'			=> 'Users send email via board',
+	'BOARD_EMAIL_FORM_EXPLAIN'	=> 'This function keeps email addresses completely private.',
+	'ADMIN_EMAIL'				=> 'Admin Email Address',
+	'EMAIL_SIG'					=> 'Email Signature',
+	'EMAIL_SIG_EXPLAIN'			=> 'This text will be attached to all emails the board sends',
+	'CONTACT_EMAIL'				=> 'Abuse email address', 
+	'CONTACT_EMAIL_EXPLAIN'		=> 'This address will be used whenever a specific contact point is needed, e.g. spam, failures, etc.', 
+	'USE_SMTP'					=> 'Use SMTP Server for email',
+	'USE_SMTP_EXPLAIN'			=> 'Say yes if you want or have to send email via a named server instead of the local mail function',
+	'SMTP_SERVER'				=> 'SMTP Server Address',
+	'SMTP_PORT'					=> 'SMTP Server Port',
+	'SMTP_PORT_EXPLAIN'			=> 'Only change this if you know your SMTP server is on a different port',
+	'SMTP_USERNAME'				=> 'SMTP Username',
+	'SMTP_USERNAME_EXPLAIN'		=> 'Only enter a username if your smtp server requires it',
+	'SMTP_PASSWORD'				=> 'SMTP Password',
+	'SMTP_PASSWORD_EXPLAIN'		=> 'Only enter a password if your smtp server requires it',
+
+
+	'BOARD_SETTINGS_EXPLAIN'	=> 'Here you can determine the basic operation of your board, from the site name through user registration to private messaging.',
+	'SITE_NAME'					=> 'Site name',
+	'SITE_DESC'					=> 'Site description',
+	'BOARD_DISABLE'				=> 'Disable board',
+	'BOARD_DISABLE_EXPLAIN'		=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
+	'ACC_ACTIVATION'			=> 'Enable account activation',
+	'ACC_ACTIVATION_EXPLAIN'	=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
+	'ACC_NONE'					=> 'None',
+	'ACC_USER'					=> 'User',
+	'ACC_ADMIN'					=> 'Admin',
+	'ACC_DISABLE'				=> 'Disable',
+	'VISUAL_CONFIRM'			=> 'Enable visual confirmation',
+	'VISUAL_CONFIRM_EXPLAIN'	=> 'Requires new users enter a random code matching an image to help prevent mass registrations.',
+	'ENABLE_COPPA'				=> 'Enable COPPA',
+	'ENABLE_COPPA_EXPLAIN'		=> 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA act.',
+	'COPPA_FAX'					=> 'COPPA Fax Number',
+	'COPPA_MAIL'				=> 'COPPA Mailing Address',
+	'COPPA_MAIL_EXPLAIN'		=> 'This is the mailing address where parents will send COPPA registration forms',
+	'BOARD_PM'					=> 'Private Messaging', 
+	'BOARD_PM_EXPLAIN'			=> 'Enable or disable private messaging for all users.', 
+	'BOXES_MAX'					=> 'Max number of message boxes',
+	'BOXES_MAX_EXPLAIN'			=> 'Users can create this many private messaging boxes.',
+	'BOXES_LIMIT'				=> 'Max messages per box',
+	'BOXES_LIMIT_EXPLAIN'		=> 'Users are limited to no more than this many messages in each of their private message boxes. Enter 0 for unlimited messages.',
+	'EDIT_TIME'					=> 'Limit editing time',
+	'EDIT_TIME_EXPLAIN'			=> 'Limits the time available to edit a new post, zero equals infinity',
+	'FLOOD_INTERVAL'			=> 'Flood Interval',
+	'FLOOD_INTERVAL_EXPLAIN'	=> 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.',
+	'SEARCH_INTERVAL'			=> 'Search Flood Interval',
+	'SEARCH_INTERVAL_EXPLAIN'	=> 'Number of seconds users must wait between searches.',
+	'MIN_SEARCH_CHARS'			=> 'Min characters indexed by search',
+	'MIN_SEARCH_CHARS_EXPLAIN'	=> 'Words with at least this many characters will be indexed for searching.',
+	'MAX_SEARCH_CHARS'			=> 'Max characters indexed by search',
+	'MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching.',
+	'TOPICS_PER_PAGE'			=> 'Topics Per Page',
+	'POSTS_PER_PAGE'			=> 'Posts Per Page',
+	'HOT_THRESHOLD'				=> 'Posts for Popular Threshold',
+	'MAX_POLL_OPTIONS'			=> 'Max number of poll options',
+
+
+	'AUTH_SETTINGS_EXPLAIN'	=> 'phpBB2 supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
+	'AUTH_METHOD'			=> 'Select an authentication method',
+	'LDAP_SERVER'			=> 'LDAP server name',
+	'LDAP_SERVER_EXPLAIN'	=> 'If using LDAP this is the name or IP address of the server.',
+	'LDAP_DN'				=> 'LDAP base dn',
+	'LDAP_DN_EXPLAIN'		=> 'This is the Distinguished Name, locating the user information, e.g. o=My Company,c=US',
+	'LDAP_UID'				=> 'LDAP uid',
+	'LDAP_UID_EXPLAIN'		=> 'This is the key under which to search for a given login identity, e.g. uid, sn, etc.',
+
+
+	'BOARD_DEFAULTS_EXPLAIN'	=> 'These settings allow you to define a number of default or global settings used by the board. For example, to disable the use of HTML across the entire board alter the relevant setting below. This data is also used for new user registrations and (where relevant) guest users.',
+	'DEFAULT_STYLE'				=> 'Default Style',
+	'OVERRIDE_STYLE'			=> 'Override user style',
+	'OVERRIDE_STYLE_EXPLAIN'	=> 'Replaces users style with the default',
+	'DEFAULT_LANGUAGE'			=> 'Default Language',
+	'DATE_FORMAT'				=> 'Date Format',
+	'DATE_FORMAT_EXPLAIN'		=> 'The date format is the same as the PHP date function.',
+	'SYSTEM_TIMEZONE'			=> 'System Timezone',
+	'SYSTEM_DST'				=> 'Enable Daylight Savings Time',
+	'CHAR_LIMIT'				=> 'Max characters per post',
+	'CHAR_LIMIT_EXPLAIN'		=> 'Set to 0 for unlimited characters.',
+	'SMILIES_LIMIT'				=> 'Max smilies per post',
+	'SMILIES_LIMIT_EXPLAIN'		=> 'Set to 0 for unlimited smilies.',
+	'ALLOW_TOPIC_NOTIFY'		=> 'Allow Topic Watching',
+	'ALLOW_FORUM_NOTIFY'		=> 'Allow Forum Watching',
+	'ALLOW_NAME_CHANGE'			=> 'Allow Username changes',
+	'ALLOW_ATTACHMENTS'			=> 'Allow Attachments',
+	'ALLOW_HTML'				=> 'Allow HTML',
+	'ALLOWED_TAGS'				=> 'Allowed HTML tags',
+	'ALLOWED_TAGS_EXPLAIN'		=> 'Separate tags with commas',
+	'ALLOW_BBCODE'				=> 'Allow BBCode',
+	'ALLOW_SMILIES'				=> 'Allow Smilies',
+	'ALLOW_SIG'					=> 'Allow Signatures',
+	'MAX_SIG_LENGTH'			=> 'Maximum signature length',
+	'MAX_SIG_LENGTH_EXPLAIN'	=> 'Maximum number of characters in user signatures',
+
+
+	'PHP_INFO_EXPLAIN'	=> 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by support or other Team Member on the support forums.', 
 
 	'Forum_admin_explain' => 'In phpBB 2.2 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.',
 	'Edit_forum' => 'Edit forum',
author	Paul S. Owen <psotfx@users.sourceforge.net>	2003-03-24 19:03:16 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2003-03-24 19:03:16 +0000
commit	12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5 (patch)
tree	f7dfb6342e98a1880cea3b6b9dfcf78b494a1730 /phpBB
parent	d1494cfd8cb7e11360bf4dd816511cf239069237 (diff)
download	forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.tar forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.tar.gz forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.tar.bz2 forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.tar.xz forums-12f21fee97c61059c4ed7b0d57eb40d40cc2a4b5.zip