5 files changed, 102 insertions, 100 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index c02910bdca..d060f7acb7 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -215,27 +215,27 @@ else if (!empty($_POST['send_file']) && $_POST['send_file'] == 2 && !defined("PH
 		$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
 	}
 
-	page_header($lang['ftp_instructs']);
+	page_header($lang['FTP_INSTRUCTS']);
 
 ?>
 	<tr>
-		<th colspan="2"><?php echo $lang['ftp_info']; ?></th>
+		<th colspan="2"><?php echo $lang['FTP_INFO']; ?></th>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['ftp_path']; ?></span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['FTP_PATH']; ?></span></td>
 		<td class="row2"><input type="text" name="ftp_dir"></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['ftp_password']; ?></span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['FTP_USERNAME']; ?></span></td>
 		<td class="row2"><input type="text" name="ftp_user"></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['ftp_username']; ?></span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['FTP_PASSWORD']; ?></span></td>
 		<td class="row2"><input type="password" name="ftp_pass"></td>
 	</tr>
 <?php
 
-	page_common_form($s_hidden_fields, $lang['Transfer_config']);
+	page_common_form($s_hidden_fields, $lang['TRANSFER_CONFIG']);
 	page_footer();
 	exit;
 
@@ -254,7 +254,7 @@ else if (!empty($_POST['ftp_file']) && !defined("PHPBB_INSTALLED"))
 		$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($_POST['config_data']) . '" />';
 		$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
 
-		page_header($lang['NoFTP_config'], "install.$phpEx");
+		page_header($lang['NO_FTP_CONFIG'], "install.$phpEx");
 
 		if ($upgrade)
 		{
@@ -278,10 +278,10 @@ else if (!empty($_POST['ftp_file']) && !defined("PHPBB_INSTALLED"))
 		}
 		else
 		{
-			page_common_form($s_hidden_fields, $lang['Download_config']);
+			page_common_form($s_hidden_fields, $lang['DOWNLOAD_CONFIG']);
 		}
 
-		page_footer($lang['Download_config'], $s_hidden_fields);
+		page_footer($lang['DOWNLOAD_CONFIG'], $s_hidden_fields);
 		exit;
 	}
 	else
@@ -321,8 +321,8 @@ else if (!empty($_POST['ftp_file']) && !defined("PHPBB_INSTALLED"))
 		// Log user in
 		$auth->login($admin_name, $admin_pass1);
 
-		page_header($lang['Inst_Step_2'], "../adm/index.$phpEx$SID");
-		page_footer($lang['Finish_Install'], $s_hidden_fields);
+		page_header($lang['INST_STEP_2'], "../adm/index.$phpEx$SID");
+		page_footer($lang['FINISH_INSTALL'], $s_hidden_fields);
 		exit;
 	}
 }
@@ -361,14 +361,14 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1
 	$script_path = preg_replace('#install\/install\.'.$phpEx.'#i', '', $_SERVER['PHP_SELF']);
 
 	// Generate installation form
-	$instruction_text = $lang['Inst_Step_0'];
+	$instruction_text = $lang['INST_STEP_0'];
 
 	if (!empty($install_step))
 	{
 		if ((($_POST['admin_pass1'] != $_POST['admin_pass2'])) ||
 			(empty($_POST['admin_pass1']) || empty($dbhost)) && $_POST['cur_lang'] == $language)
 		{
-			$error = $lang['Password_mismatch'];
+			$error = $lang['PASSWORD_MISMATCH'];
 		}
 
 		if ((($_POST['board_email1'] != $_POST['board_email2'])) ||
@@ -386,9 +386,9 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1
 		$dbms_options .= '<option value="' . $dbms_name . '">' . $details['LABEL'] . '</option>';
 	}
 
-	$upgrade_option = '<option value="0">' . $lang['Install'] . '</option>';
-	$upgrade_option .= '<option value="1">' . $lang['Upgrade'] . '</option>';
-	$upgrade_option .= '<option value="2">' . $lang['Update'] . '</option>';
+	$upgrade_option = '<option value="0">' . $lang['INSTALL'] . '</option>';
+	$upgrade_option .= '<option value="1">' . $lang['UPGRADE'] . '</option>';
+	$upgrade_option .= '<option value="2">' . $lang['UPDATE'] . '</option>';
 
 	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
 
@@ -396,45 +396,45 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1
 
 ?>
 	<tr>
-		<th colspan="2"><?php echo $lang['Initial_config']; ?></th>
+		<th colspan="2"><?php echo $lang['INITIAL_CONFIG']; ?></th>
 	</tr>
 	<tr>
-		<td class="row1" align="right" width="40%"><span class="gen"><?php echo $lang['Default_lang']; ?>: </span></td>
+		<td class="row1" align="right" width="40%"><span class="gen"><?php echo $lang['DEFAULT_LANG']; ?>: </span></td>
 		<td class="row2"><select name="lang"><?php echo $lang_options; ?></select></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['dbms']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['DBMS']; ?>: </span></td>
 		<td class="row2"><select name="dbms" onchange="if (document.install_form.upgrade.options[upgrade.selectedIndex].value == 1) { document.install_form.dbms.selectedIndex=0}"><?php echo $dbms_options; ?></select></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['Install_Method']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['INSTALL_METHOD']; ?>: </span></td>
 		<td class="row2"><select name="upgrade" onchange="if (this.options[this.selectedIndex].value == 1) { document.install_form.dbms.selectedIndex=0; }"><?php echo $upgrade_option; ?></select></td>
 	</tr>
 	<tr>
-		<th colspan="2"><?php echo $lang['DB_config']; ?></th>
+		<th colspan="2"><?php echo $lang['DB_CONFIG']; ?></th>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Host']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_HOST']; ?>: </span></td>
 		<td class="row2"><input type="text" name="dbhost" value="<?php echo ($dbhost != '') ? $dbhost : ''; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Name']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_NAME']; ?>: </span></td>
 		<td class="row2"><input type="text" name="dbname" value="<?php echo ($dbname != '') ? $dbname : ''; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Username']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_USERNAME']; ?>: </span></td>
 		<td class="row2"><input type="text" name="dbuser" value="<?php echo ($dbuser != '') ? $dbuser : ''; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Password']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_PASSWORD']; ?>: </span></td>
 		<td class="row2"><input type="password" name="dbpasswd" value="<?php echo ($dbpasswd != '') ? $dbpasswd : ''; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['Table_Prefix']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['TABLE_PREFIX']; ?>: </span></td>
 		<td class="row2"><input type="text" name="prefix" value="<?php echo (!empty($table_prefix)) ? $table_prefix : 'phpbb_'; ?>" /></td>
 	</tr>
 	<tr>
-		<th colspan="2"><?php echo $lang['Admin_config']; ?></th>
+		<th colspan="2"><?php echo $lang['ADMIN_CONFIG']; ?></th>
 	</tr>
 <?php
 
@@ -449,19 +449,19 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1
 	}
 ?>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['Server_name']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['SERVER_NAME']; ?>: </span></td>
 		<td class="row2"><input type="text" name="server_name" value="<?php echo $server_name; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['Server_port']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['SERVER_PORT']; ?>: </span></td>
 		<td class="row2"><input type="text" name="server_port" value="<?php echo $server_port; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['Script_path']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['SCRIPT_PATH']; ?>: </span></td>
 		<td class="row2"><input type="text" name="script_path" value="<?php echo $script_path; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Username']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['ADMIN_USERNAME']; ?>: </span></td>
 		<td class="row2"><input type="text" name="admin_name" value="<?php echo ($admin_name != '') ? $admin_name : ''; ?>" /></td>
 	</tr>
 	<tr>
@@ -473,16 +473,16 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1
 		<td class="row2"><input type="text" name="board_email2" value="<?php echo ($board_email2 != '') ? $board_email2 : ''; ?>" /></td>
 	</tr> 
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Password']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['ADMIN_PASSWORD']; ?>: </span></td>
 		<td class="row2"><input type="password" name="admin_pass1" value="<?php echo ($admin_pass1 != '') ? $admin_pass1 : ''; ?>" /></td>
 	</tr>
 	<tr>
-		<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Password_confirm']; ?>: </span></td>
+		<td class="row1" align="right"><span class="gen"><?php echo $lang['ADMIN_PASSWORD_CONFIRM']; ?>: </span></td>
 		<td class="row2"><input type="password" name="admin_pass2" value="<?php echo ($admin_pass2 != '') ? $admin_pass2 : ''; ?>" /></td>
 	</tr>
 <?php
 
-	page_footer($lang['Start_Install'], $s_hidden_fields, "install.$phpEx");
+	page_footer($lang['START_INSTALL'], $s_hidden_fields, "install.$phpEx");
 
 	exit;
 }
@@ -521,7 +521,7 @@ else
 			break;
 	}
 
-	// Add additionale extension checks to this array
+	// Add additional extension checks to this array
 	$check_other = array_merge($check_other, array());
 
 	if (!extension_loaded($check_exts) && !extension_loaded($check_other))
@@ -565,8 +565,8 @@ else
 
 		if (!$loaded_extension)
 		{
-			page_header($lang['Install'], '');
-			page_error($lang['Installer_Error'], $lang['INSTALL_EXT_FAILED']);
+			page_header($lang['INSTALL'], '');
+			page_error($lang['INSTALLER_ERROR'], $lang['INSTALL_EXT_FAILED']);
 			page_footer();
 			exit;
 		}
@@ -614,8 +614,8 @@ else
 					if (!$db->sql_query($sql))
 					{
 						$error = $db->sql_error();
-						page_header($lang['Install'], '');
-						page_error($lang['Installer_Error'], $lang['Install_db_error'] . '<br />' . $error['message']);
+						page_header($lang['INSTALL'], '');
+						page_error($lang['INSTALLER_ERROR'], $lang['INSTALL_DB_ERROR'] . '<br />' . $error['message']);
 						page_footer();
 						exit;
 					}
@@ -634,8 +634,8 @@ else
 					if (!$db->sql_query($sql))
 					{
 						$error = $db->sql_error();
-						page_header($lang['Install'], '');
-						page_error($lang['Installer_Error'], $lang['Install_db_error'] . '<br />' . $error['message']);
+						page_header($lang['INSTALL'], '');
+						page_error($lang['INSTALLER_ERROR'], $lang['INSTALL_DB_ERROR'] . '<br />' . $error['message']);
 						page_footer();
 						exit;
 					}
@@ -688,8 +688,8 @@ else
 				if (!$db->sql_query($sql))
 				{
 					$error = $db->sql_error();
-					page_header($lang['Install'], '');
-					page_error($lang['Installer_Error'], $lang['Install_db_error'] . '<br />' . $error['message']);
+					page_header($lang['INSTALL'], '');
+					page_error($lang['INSTALLER_ERROR'], $lang['INSTALL_DB_ERROR'] . '<br />' . $error['message']);
 					page_footer();
 					exit;
 				}
@@ -724,24 +724,24 @@ else
 
 				if (extension_loaded('ftp') && !defined('NO_FTP'))
 				{
-					page_header($lang['Unwriteable_config'] . '<p>' . $lang['ftp_option'] . '</p>');
+					page_header($lang['UNWRITEABLE_CONFIG'] . '<p>' . $lang['FTP_OPTION'] . '</p>');
 ?>
 					<tr>
-						<th colspan="2"><?php echo $lang['ftp_choose']; ?></th>
+						<th colspan="2"><?php echo $lang['FTP_CHOOSE']; ?></th>
 					</tr>
 					<tr>
-						<td class="row1" align="right" width="50%"><span class="gen"><?php echo $lang['Attempt_ftp']; ?></span></td>
+						<td class="row1" align="right" width="50%"><span class="gen"><?php echo $lang['ATTEMPT_FTP']; ?></span></td>
 						<td class="row2"><input type="radio" name="send_file" value="2"></td>
 					</tr>
 					<tr>
-						<td class="row1" align="right" width="50%"><span class="gen"><?php echo $lang['Send_file']; ?></span></td>
+						<td class="row1" align="right" width="50%"><span class="gen"><?php echo $lang['SEND_FILE']; ?></span></td>
 						<td class="row2"><input type="radio" name="send_file" value="1"></td>
 					</tr>
 <?php 
 				}
 				else
 				{
-					page_header($lang['Unwriteable_config']);
+					page_header($lang['UNWRITEABLE_CONFIG']);
 					$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
 				}
 
@@ -766,7 +766,7 @@ else
 				}
 				else
 				{
-					page_common_form($s_hidden_fields, $lang['Download_config']);
+					page_common_form($s_hidden_fields, $lang['DOWNLOAD_CONFIG']);
 				}
 
 				page_footer();
@@ -776,11 +776,11 @@ else
 			$result = @fputs($fp, $config_data, strlen($config_data));
 
 			@fclose($fp);
-			$upgrade_now = $lang['upgrade_submit'];
+			$upgrade_now = $lang['UPGRADE_SUBMIT'];
 		}
 
 		// First off let's check and see if we are supposed to be doing an upgrade.
-		if ($upgrade && $upgrade_now == $lang['upgrade_submit'])
+		if ($upgrade && $upgrade_now == $lang['UPGRADE_SUBMIT'])
 		{
 			define('INSTALLING', true);
 			require('upgrade.'.$phpEx);
@@ -805,8 +805,8 @@ else
 		// Log user in
 		$auth->login($admin_name, $admin_pass1);
 
-		page_header($lang['Inst_Step_2'], "../adm/index.$phpEx$SID");
-		page_footer($lang['Finish_Install'], $s_hidden_fields);
+		page_header($lang['INST_STEP_2'], "../adm/index.$phpEx$SID");
+		page_footer($lang['FINISH_INSTALL'], $s_hidden_fields);
 		exit;
 	}
 }
@@ -841,14 +841,14 @@ th		{ background-image: url('../adm/images/cellpic3.gif') }
 td.cat	{ background-image: url('../adm/images/cellpic1.gif') }
 //-->
 </style>
-<title><?php echo $lang['Welcome_install']; ?></title>
+<title><?php echo $lang['WELCOME_INSTALL']; ?></title>
 </head>
 <body>
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr>
 		<td><img src="../adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td>
-		<td width="100%" background="../adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['Welcome_install']; ?></span> &nbsp; &nbsp; &nbsp;</td>
+		<td width="100%" background="../adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['WELCOME_INSTALL']; ?></span> &nbsp; &nbsp; &nbsp;</td>
 	</tr>
 </table>
 
@@ -903,10 +903,10 @@ function page_upgrade_form()
 
 ?>
 					<tr>
-						<td class="cat" colspan="2" align="center"><?php echo $lang['continue_upgrade']; ?></td>
+						<td class="cat" colspan="2" align="center"><?php echo $lang['CONTINUE_UPGRADE']; ?></td>
 					</tr>
 					<tr>
-						<td class="cat" colspan="2" align="center"><input type="submit" name="upgrade_now" value="<?php echo $lang['upgrade_submit']; ?>" /></td>
+						<td class="cat" colspan="2" align="center"><input type="submit" name="upgrade_now" value="<?php echo $lang['UPGRADE_SUBMIT']; ?>" /></td>
 					</tr>
 <?php 
 
diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql
index a9908c69c5..6cb51e5f0d 100644
--- a/phpBB/install/schemas/mysql_basic.sql
+++ b/phpBB/install/schemas/mysql_basic.sql
@@ -197,7 +197,7 @@ INSERT INTO phpbb_styles (style_id, template_id, theme_id, imageset_id, style_na
 INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_path, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_ip, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_no_email, btn_no_www, btn_no_icq, btn_no_aim, btn_no_yim, btn_no_msnm, btn_online, btn_offline, btn_topic_watch, btn_topic_unwatch, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, sub_forum, sub_forum_new, folder, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, poll_left, poll_center, poll_right) VALUES (1, 'subSilver &copy; phpBB Group', 'subSilver', '"imagesets/subSilver/{LANG}/btn_post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/btn_post_pm.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/btn_reply.gif" width="88" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="25" border="0"', '"imagesets/subSilver/{LANG}/btn_locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/btn_profile.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_pm.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_delete.gif" width="16" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_ip.gif" width="16" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_quote.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_search.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_edit.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_report.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_email.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_www.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_icq.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_aim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_yim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_msnm.gif" width="59" height="18" border="0"', '', '', '', '', '', '', '"imagesets/subSilver/{LANG}/btn_online.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/btn_offline.gif" width="59" height="18" border="0"', NULL, NULL, '"imagesets/subSilver/icon_unapproved.gif" width="19" height="18" border="0"', '"imagesets/subSilver/icon_reported.gif" width="19" height="18" border="0"', '"imagesets/subSilver/icon_minipost.gif" width="14" height="18" border="0"', '"imagesets/subSilver/icon_minipost.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_minipost_new.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_latest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/icon_newest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/folder_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_new_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_locked_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/subfolder_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/subfolder_new_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_hot_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_hot_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_new_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_new_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_new_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/voting_lcap.gif" width="4" height="12" border="0"', '"imagesets/subSilver/voting_bar.gif" height="12" border="0"', '"imagesets/subSilver/voting_rcap.gif" width="4" height="12" border="0"');
 
 # -- phpbb_styles_template
-INSERT INTO phpbb_styles_template (template_id, template_name, template_path, poll_length, pm_box_length, compile_crc) VALUES (1, 'subSilver &copy; phpBB Group', 'subSilver', 205, 175, '');
+INSERT INTO phpbb_styles_template (template_id, template_name, template_path, poll_length, pm_box_length) VALUES (1, 'subSilver &copy; phpBB Group', 'subSilver', 205, 175);
 
 # -- phpbb_styles_theme
 INSERT INTO phpbb_styles_theme (theme_id, css_data, css_external) VALUES (1, 'body {background: white url(\'templates/subSilver/images/background.png\') repeat-x;}\nth { background-image: url(\'templates/subSilver/images/cellpic3.gif\') }\ntd.cat { background-image: url(\'templates/subSilver/images/cellpic1.gif\') }\ntd.rowpic { background-image: url(\'templates/subSilver/images/cellpic2.jpg\'); background-repeat: repeat-y }\ntd.icqback { background-image: url(\'templates/subSilver/images/icon_icq_add.gif\'); background-repeat: no-repeat }', 'subSilver/subSilver.css');
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 63409ccfcf..c3f36dfc9a 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -804,7 +804,7 @@ CREATE TABLE phpbb_users (
    user_id mediumint(8) UNSIGNED NOT NULL auto_increment,
    user_active tinyint(1) DEFAULT '1',
    user_founder tinyint(1) DEFAULT '0',
-   group_id mediumint(8) DEFAULT '3' NOT NULL
+   group_id mediumint(8) DEFAULT '3' NOT NULL,
    user_permissions text NULL,
    user_ip varchar(40),
    user_regdate int(11) DEFAULT '0' NOT NULL,
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 159e82e830..957aa0b785 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -552,7 +552,7 @@ $lang = array_merge($lang, array(
 	'prune_days' => 'Remove topics that have not been posted to in',
 	'SET_NON_POSTABLE' => 'Set this forum as non-postable and',
 	'Forum_delete' => 'Delete Forum',
-	'Update' => 'Update',
+	'UPDATE' => 'Update',
 	'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.',
 	'Move_and_Delete' => 'Move and Delete',
 	'Move_posts_to' => 'Move posts to',
@@ -813,50 +813,52 @@ $lang = array_merge($lang, array(
 	'EVT_CREATED' => 'The event has been successfully created.', 
 
 
-	'Welcome_install' => 'Welcome to phpBB 2 Installation',
-	'Initial_config' => 'Basic Configuration',
-	'DB_config' => 'Database Configuration',
-	'Admin_config' => 'Admin Configuration',
-	'continue_upgrade' => 'Once you have downloaded your config file to your local machine you may\'Continue Upgrade\' button below to move forward with the upgrade process.  Please wait to upload the config file until the upgrade process is complete.',
-	'upgrade_submit' => 'Continue Upgrade',
-	'Installer_Error' => 'An error has occurred during installation',
+	'WELCOME_INSTALL' => 'Welcome to phpBB 2 Installation',
+	'INITIAL_CONFIG' => 'Basic Configuration',
+	'DB_CONFIG' => 'Database Configuration',
+	'ADMIN_CONFIG' => 'Admin Configuration',
+	'CONTINUE_UPGRADE' => 'Once you have downloaded your config file to your local machine you may\'Continue Upgrade\' button below to move forward with the upgrade process.  Please wait to upload the config file until the upgrade process is complete.',
+	'UPGRADE_SUBMIT' => 'Continue Upgrade',
+	'INSTALLER_ERROR' => 'An error has occurred during installation',
 	'Previous_Install' => 'A previous installation has been detected',
-	'Install_db_error' => 'An error occurred trying to update the database',
+	'INSTALL_DB_ERROR' => 'An error occurred trying to update the database',
+	'INSTALL_EMAIL_MISMATCH' => 'The emails you entered did not match',
 	'Re_install' => 'Your previous installation is still active. <br /><br />If you would like to re-install phpBB 2 you should click the Yes button below. Please be aware that doing so will destroy all existing data, no backups will be made! The administrator username and password you have used to login in to the board will be re-created after the re-installation, no other settings will be retained. <br /><br />Think carefully before pressing Yes!',
-	'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. If you are installing to a database that uses ODBC, e.g. MS Access you should first create a DSN for it before proceeding.',
-	'Start_Install' => 'Start Install',
-	'Finish_Install' => 'Finish Installation',
-	'Default_lang' => 'Default board language',
-	'DB_Host' => 'Database Server Hostname / DSN',
-	'DB_Name' => 'Your Database Name',
-	'DB_Username' => 'Database Username',
-	'DB_Password' => 'Database Password',
+	'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. If you are installing to a database that uses ODBC, e.g. MS Access you should first create a DSN for it before proceeding.',
+	'START_INSTALL' => 'Start Install',
+	'FINISH_INSTALL' => 'Finish Installation',
+	'DEFAULT_LANG' => 'Default board language',
+	'DB_HOST' => 'Database Server Hostname / DSN',
+	'DB_NAME' => 'Your Database Name',
+	'DB_USERNAME' => 'Database Username',
+	'DB_PASSWORD' => 'Database Password',
 	'Database' => 'Your Database',
 	'Install_lang' => 'Choose Language for Installation',
-	'dbms' => 'Database Type',
-	'Table_Prefix' => 'Prefix for tables in database',
-	'Admin_Username' => 'Administrator Username',
-	'Admin_Password' => 'Administrator Password',
-	'Admin_Password_confirm' => 'Administrator Password [ Confirm ]',
-	'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.',
-	'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.',
-	'Download_config' => 'Download Config',
-	'ftp_choose' => 'Choose Download Method',
-	'ftp_option' => '<br />Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically ftp the config file into place.',
-	'ftp_instructs' => 'You have chosen to ftp the file to the account containing phpBB 2 automatically.  Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it using any normal client.',
-	'ftp_info' => 'Enter Your FTP Information',
-	'Attempt_ftp' => 'Attempt to ftp config file into place',
-	'Send_file' => 'Just send the file to me and I will ftp it manually',
-	'ftp_path' => 'FTP path to phpBB 2',
-	'ftp_username' => 'Your FTP Username',
-	'ftp_password' => 'Your FTP Password',
-	'Transfer_config' => 'Start Transfer',
-	'NoFTP_config' => 'The attempt to ftp the config file into place failed.  Please download the config file and ftp it into place manually.',
-	'Install' => 'Install',
-	'Upgrade' => 'Upgrade',
-	'Install_Method' => 'Choose your installation method',
+	'DBMS' => 'Database Type',
+	'TABLE_PREFIX' => 'Prefix for tables in database',
+	'ADMIN_USERNAME' => 'Administrator Username',
+	'ADMIN_EMAIL_CONFIRM' => 'Admin Email Address [ Confirm ]',
+	'ADMIN_PASSWORD' => 'Administrator Password',
+	'ADMIN_PASSWORD_CONFIRM' => 'Administrator Password [ Confirm ]',
+	'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.',
+	'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.',
+	'DOWNLOAD_CONFIG' => 'Download Config',
+	'FTP_CHOOSE' => 'Choose Download Method',
+	'FTP_OPTION' => '<br />Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically ftp the config file into place.',
+	'FTP_INSTRUCTS' => 'You have chosen to ftp the file to the account containing phpBB 2 automatically.  Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it using any normal client.',
+	'FTP_INFO' => 'Enter Your FTP Information',
+	'ATTEMPT_FTP' => 'Attempt to ftp config file into place',
+	'SEND_FILE' => 'Just send the file to me and I will ftp it manually',
+	'FTP_PATH' => 'FTP path to phpBB 2',
+	'FTP_USERNAME' => 'Your FTP Username',
+	'FTP_PASSWORD' => 'Your FTP Password',
+	'TRANSFER_CONFIG' => 'Start Transfer',
+	'NO_FTP_CONFIG' => 'The attempt to ftp the config file into place failed.  Please download the config file and ftp it into place manually.',
+	'INSTALL' => 'Install',
+	'UPGRADE' => 'Upgrade',
+	'INSTALL_METHOD' => 'Choose your installation method',
 	'Install_No_PHP4' => 'phpBB2 requires you have at least PHP 4.0.4 installed<br /><br />Contact your hosting provider or see <a href=\"http://www.php.net/\">www.php.net</a> for more information',
-	'Install_No_Ext' => 'The PHP configuration on your server does not support the database type that you choose<br /><br />Contact your hosting provider or see <a href=\"http://www.php.net/\">www.php.net</a> for more information',
+	'INSTALL_EXT_FAILED' => 'The PHP configuration on your server does not support the database type that you choose<br /><br />Contact your hosting provider or see <a href=\"http://www.php.net/\">www.php.net</a> for more information',
 	'Install_No_PCRE' => 'phpBB2 requires the Perl-Compatible Regular Expressions module for PHP to be available<br /><br />Contact your hosting provider or see <a href=\"http://www.php.net/\">www.php.net</a> for more information',
 ));
 
diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 6f79db1279..5784977934 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -605,7 +605,7 @@ $lang = array(
 	'Hide_user' => 'Hide your online status',
 	'Profile_updated' => 'Your profile has been updated',
 	'Profile_updated_inactive' => 'Your profile has been updated, however you have changed vital details thus your account is now inactive. Check your email to find out how to reactivate your account, or if admin activation is require wait for the administrator to reactivate your account',
-	'Password_mismatch' => 'The passwords you entered did not match',
+	'PASSWORD_MISMATCH' => 'The passwords you entered did not match',
 	'Current_password_mismatch' => 'The current password you supplied does not match that stored in the database',
 	'Password_long' => 'Your password must be no more than 32 characters',
 	'Username_taken' => 'Sorry but this username has already been taken',