Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r11198 -r11199
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11198)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11199)
@@ -600,6 +600,7 @@
 UPDATE Phrase SET Module = 'Core' WHERE Module IN ('Proj-Base', 'In-Portal');
 UPDATE Phrase SET Module = 'Core' WHERE Phrase IN ('la_fld_Phone', 'la_fld_City', 'la_fld_State', 'la_fld_Zip');
 UPDATE Phrase SET Module = 'Core' WHERE Phrase IN ('la_col_Image', 'la_col_Username', 'la_fld_AddressLine1', 'la_fld_AddressLine2', 'la_fld_Comments', 'la_fld_Country', 'la_fld_Email', 'la_fld_Language', 'la_fld_Login', 'la_fld_MessageText', 'la_fld_MetaDescription', 'la_fld_MetaKeywords', 'la_fld_Password', 'la_fld_Username', 'la_fld_Type');
+
 UPDATE Phrase SET Phrase = 'la_Add' WHERE Phrase = 'LA_ADD';
 UPDATE Phrase SET Phrase = 'la_col_MembershipExpires' WHERE Phrase = 'la_col_membershipexpires';
 UPDATE Phrase SET Phrase = 'la_ShortToolTip_Clone' WHERE Phrase = 'la_shorttooltip_clone';
@@ -611,7 +612,16 @@
 UPDATE Phrase SET Phrase = 'la_ShortToolTip_MoveDown' WHERE Phrase = 'la_shorttooltip_movedown';
 UPDATE Phrase SET Phrase = 'la_ShortToolTip_RescanThemes' WHERE Phrase = 'la_shorttooltip_rescanthemes';
 UPDATE Phrase SET Phrase = 'la_ShortToolTip_SetPrimary' WHERE Phrase = 'LA_SHORTTOOLTIP_SETPRIMARY';
+UPDATE Phrase SET Phrase = 'la_ShortToolTip_Rebuild' WHERE Phrase = 'LA_SHORTTOOLTIP_REBUILD';
+UPDATE Phrase SET Phrase = 'la_Tab_Service' WHERE Phrase = 'la_tab_service';
 UPDATE Phrase SET Phrase = 'la_tab_Files' WHERE Phrase = 'la_tab_files';
+UPDATE Phrase SET Phrase = 'la_ToolTipShort_Edit_Current_Category' WHERE Phrase = 'LA_TOOLTIPSHORT_EDIT_CURRENT_CATEGORY';
+UPDATE Phrase SET Phrase = 'la_ToolTip_Add' WHERE Phrase = 'LA_TOOLTIP_ADD';
+UPDATE Phrase SET Phrase = 'la_ToolTip_Add_Product' WHERE Phrase = 'LA_TOOLTIP_ADD_PRODUCT';
+UPDATE Phrase SET Phrase = 'la_ToolTip_NewSearchConfig' WHERE Phrase = 'LA_TOOLTIP_NEWSEARCHCONFIG';
+UPDATE Phrase SET Phrase = 'la_ToolTip_Prev' WHERE Phrase = 'la_tooltip_prev';
+UPDATE Phrase SET Phrase = 'la_Invalid_Password' WHERE Phrase = 'la_invalid_password';
+
 UPDATE Events SET Module = REPLACE(Module, 'In-Portal', 'Core');
 
 DROP TABLE ImportScripts;
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -r11197 -r11199
--- branches/RC/core/install/english.lang	(.../english.lang)	(revision 11197)
+++ branches/RC/core/install/english.lang	(.../english.lang)	(revision 11199)
@@ -897,7 +897,7 @@
 			<PHRASE Label="la_invalid_email" Module="Core" Type="1">SW52YWxpZCBFLU1haWw=</PHRASE>
 			<PHRASE Label="la_invalid_integer" Module="Core" Type="1">SW5jb3JyZWN0IGRhdGEgZm9ybWF0LCBwbGVhc2UgdXNlIGludGVnZXI=</PHRASE>
 			<PHRASE Label="la_invalid_license" Module="Core" Type="1">TWlzc2luZyBvciBpbnZhbGlkIEluLVBvcnRhbCBMaWNlbnNl</PHRASE>
-			<PHRASE Label="la_invalid_password" Module="Core" Type="1">SW5jb3JyZWN0IFVzZXJuYW1lIG9yIFBhc3N3b3Jk</PHRASE>
+			<PHRASE Label="la_Invalid_Password" Module="Core" Type="1">SW5jb3JyZWN0IFVzZXJuYW1lIG9yIFBhc3N3b3Jk</PHRASE>
 			<PHRASE Label="la_invalid_state" Module="Core" Type="0">SW52YWxpZCBzdGF0ZQ==</PHRASE>
 			<PHRASE Label="la_ItemTab_Categories" Module="Core" Type="1">Q2F0ZWdvcmllcw==</PHRASE>
 			<PHRASE Label="la_ItemTab_Links" Module="Core" Type="1">TGlua3M=</PHRASE>
Index: branches/RC/core/install.php
===================================================================
diff -u -r11181 -r11199
--- branches/RC/core/install.php	(.../install.php)	(revision 11181)
+++ branches/RC/core/install.php	(.../install.php)	(revision 11199)
@@ -803,11 +803,12 @@
 								$this->Done();
 							}
 							$start_from_query = 0; // so that next module start from the beggining
-							$this->RunUpgrades($module_info['Path'], $regs[1], 'after');
 
+							$this->toolkit->ImportLanguage('/' . $module_info['Path'] . 'install/english', true);
+							$this->RunUpgrades($module_info['Path'], $regs[1], 'after'); // upgrade script could operate resulting language pack
+
 							// after upgrade sqls are executed update version and upgrade language pack
 							$this->toolkit->SetModuleVersion($module_name, $module_info['ToVersion']);
-							$this->toolkit->ImportLanguage('/' . $module_info['Path'] . 'install/english', true);
 						}
 					}
 					break;