Index: branches/RC/admin/install.php
===================================================================
diff -u -N -r10832 -r10924
--- branches/RC/admin/install.php	(.../install.php)	(revision 10832)
+++ branches/RC/admin/install.php	(.../install.php)	(revision 10924)
@@ -1334,18 +1334,8 @@
 		// KERNEL 4 INIT: END
 
 		$lang_xml =& $application->recallObject('LangXML');
+		/* @var $lang_xml LangXML_Parser */
 
-		if (defined('DBG_FAST_INSTALL') && DBG_FAST_INSTALL) {
-			$lang_xml->tables['phrases'] = TABLE_PREFIX.'Phrase';
-			$lang_xml->tables['emailmessages'] = TABLE_PREFIX.'EmailMessage';
-		}
-		else {
-			$lang_xml->renameTable('phrases', TABLE_PREFIX.'ImportPhrases');
-			$lang_xml->renameTable('emailmessages', TABLE_PREFIX.'ImportEvents');
-		}
-
-		$lang_xml->lang_object->TableName = $application->getUnitOption('lang','TableName');
-
 		$languages = $application->GetVar('lang');
 		if($languages)
 		{
@@ -1360,17 +1350,11 @@
 				foreach($modules as $module_name => $module_folder)
 				{
 					$lang_path = MODULES_PATH.'/'.$module_folder.'admin/install/langpacks';
-					$lang_xml->Parse($lang_path.'/'.$lang_file, '|0|1|2|', '');
-					if($force_finish) $lang_xml->lang_object->Update();
+					$lang_xml->Parse($lang_path.'/'.$lang_file, '|0|1|2|', '', $force_finish ? LANG_SKIP_EXISTING : LANG_OVERWRITE_EXISTING);
 				}
 			}
 
-			if (defined('DBG_FAST_INSTALL') && DBG_FAST_INSTALL) {
-				$state = 'lang_default';
-			}
-			else {
-				$state = 'lang_install';
-			}
+			$state = 'lang_default'; // lang_install
 		}
 		else
 		{
@@ -1399,7 +1383,7 @@
 
 	if($Status == 0)
 	{
-		$Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2", $force_finish ? false : true, 200,$Offset);
+		$Offset = $objLanguages->ReadImportTable($PhraseTable, 1, "0,1,2", $force_finish ? false : true, 200, $Offset);
 		if($Offset >= $Total)
 		{
 			$Offset=0;