diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
new file mode 100755
index 0000000000..7755cf957e
--- /dev/null
+++ b/phpBB/adm/style/install_convert.html
@@ -0,0 +1,100 @@
+<!-- INCLUDE install_header.html -->
+
+<form id="install_convert" method="post" action="{U_ACTION}">
+
+<h2>{TITLE}</h2>
+{BODY}
+
+<!-- IF S_LIST -->
+<table cellspacing="1">
+	<caption>{L_AVAILABLE_CONVERTORS}</caption>
+	<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+	<thead>
+		<tr>
+			<th>{L_SOFTWARE}</th>
+			<th>{L_VERSION}</th>
+			<th>{L_AUTHOR}</th>
+			<th>{L_OPTIONS}</th>
+		</tr>
+	</thead>
+	<tbody>
+	<!-- IF .convertors -->
+		<!-- BEGIN convertors -->
+		<tr>
+			<td>{convertors.SOFTWARE}</td>
+			<td>{convertors.VERSION}</td>
+			<td>{convertors.AUTHOR}</td>
+			<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
+		</tr>
+		<!-- END convertors -->
+	<!-- ELSE -->
+		<tr>
+			<td>{L_NO_CONVERTORS}</td>
+			<td>-</td>
+			<td>-</td>
+			<td>-</td>
+		</tr>
+	<!-- ENDIF -->
+	</tbody>
+</table>
+<!-- ENDIF -->
+
+<!-- IF .checks -->
+	<fieldset>
+
+	<!-- BEGIN checks -->
+		<!-- IF checks.S_LEGEND -->
+			<!-- IF not checks.S_FIRST_ROW -->
+			</fieldset>
+
+			<fieldset>
+			<!-- ENDIF -->
+				<legend>{checks.LEGEND}</legend>
+				<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
+		<!-- ELSE -->
+
+			<dl>
+				<dt>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{checks.RESULT}</dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- END checks -->
+
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF .options -->
+	<fieldset>
+
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+				</fieldset>
+		
+				<fieldset>
+			<!-- ENDIF -->
+				<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
+
+			<dl>
+				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dd>{options.CONTENT}</dd>
+			</dl>
+
+		<!-- ENDIF -->
+	<!-- END options -->
+
+	</fieldset>
+<!-- ENDIF -->
+
+<!-- IF L_SUBMIT -->
+<fieldset class="submit-buttons">
+	<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
+	{S_HIDDEN}
+	<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+</fieldset>
+<!-- ENDIF -->
+
+
+</form>
+<!-- INCLUDE install_footer.html -->
\ No newline at end of file
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index ac0b731b24..7f3dab4522 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -68,6 +68,11 @@ $lang = array_merge($lang, array(
 	'DBMS'						=> 'Database type',
 	'DB_CONFIG'					=> 'Database Configuration',
 	'DB_CONNECTION'				=> 'Database Connection',
+	'DB_ERR_INSERT'				=> 'Error while processing INSERT query',
+	'DB_ERR_LAST'				=> 'Error while processing query_last',
+	'DB_ERR_QUERY_FIRST'		=> 'Error while executing query_first',
+	'DB_ERR_QUERY_FIRST_TABLE'	=> 'Error while executing query_first, %s ("%s")',
+	'DB_ERR_SELECT'				=> 'Error while running SELECT query',
 	'DB_HOST'					=> 'Database server hostname or DSN',
 	'DB_HOST_EXPLAIN'			=> 'DSN stands for Data Source Name and is relevant only for ODBC installs.',
 	'DB_NAME'					=> 'Database name',
@@ -104,6 +109,7 @@ $lang = array_merge($lang, array(
 	'FILES_REQUIRED_EXPLAIN'	=> '<b>Required</b> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see "Not Found" you need to create the relevant file or directory. If you see "Unwriteable" you need to change the permissions on the file or directory to allow phpBB to write to it.',
 	'FILLING_TABLE'				=> 'Filling table <b>%s</b>',
 	'FILLING_TABLES'			=> 'Filling Tables',
+	'FINAL_STEP'				=> 'Process Final Step',
 	'FORUM_ADDRESS'				=> 'Forum address',
 	'FORUM_ADDRESS_EXPLAIN'		=> 'This is the http address of your former forum',
 	'FORUM_PATH'				=> 'Forum path',
@@ -156,8 +162,10 @@ $lang = array_merge($lang, array(
 	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br />&#187;<b>%s</b>',
 	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br />&#187;<b>%s</b>',
 
+	'NAMING_CONFLICT'			=> 'Naming conflict: %s and %s are both aliases<br /><br />%s',
 	'NEXT_STEP'					=> 'Proceed to next step',
 	'NOT_FOUND'					=> 'Cannot find',
+	'NOT_UNDERSTAND'			=> 'Could not understand %s #%d, table %s ("%s")',
 	'NO_CONVERTORS'				=> 'No convertors are available for use',
 	'NO_CONVERT_SPECIFIED'		=> 'No convertor specified',
 	'NO_LOCATION'				=> 'Cannot determine location',
@@ -178,6 +186,7 @@ $lang = array_merge($lang, array(
 	'PREFIX_FOUND'				=> 'A scan of your tables has shown a valid installation using <b>%s</b> as table prefix.',
 	'PREPROCESS_STEP'			=> 'Executing pre-processing functions/queries',
 	'PRE_CONVERT_COMPLETE'		=> 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process.',
+	'PROCESS_LAST'				=> 'Processing last statements',
 
 //	'REQUIRED'					=> 'Required',
 	'REQUIREMENTS_TITLE'		=> 'Installation Compatibility',
@@ -201,6 +210,7 @@ $lang = array_merge($lang, array(
 	'STAGE_REQUIREMENTS'		=> 'Requirements',
 	'STAGE_SETTINGS'			=> 'Settings',
 	'STARTING_CONVERT'			=> 'Starting Conversion Process',
+	'STEP_PERCENT_COMPLETED'	=> 'Step <b>%d</b> of <b>%d</b>: %d%% completed',
 	'SUB_INTRO'					=> 'Introduction',
 	'SUB_LICENSE'				=> 'License',
 	'SUB_SUPPORT'				=> 'Support',