Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r11186 -r11197
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11186)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11197)
@@ -599,8 +599,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 Events SET Module = REPLACE(Module, 'In-Portal', 'Core');
-
+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');
 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';
@@ -613,6 +612,7 @@
 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_tab_Files' WHERE Phrase = 'la_tab_files';
+UPDATE Events SET Module = REPLACE(Module, 'In-Portal', 'Core');
 
 DROP TABLE ImportScripts;
 
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -r11183 -r11197
--- branches/RC/core/install/english.lang	(.../english.lang)	(revision 11183)
+++ branches/RC/core/install/english.lang	(.../english.lang)	(revision 11197)
@@ -689,7 +689,7 @@
 			<PHRASE Label="la_fld_Changes" Module="Core" Type="1">Q2hhbmdlcw==</PHRASE>
 			<PHRASE Label="la_fld_Charset" Module="Core" Type="1">Q2hhcnNldA==</PHRASE>
 			<PHRASE Label="la_fld_CheckDuplicatesMethod" Module="Core" Type="1">Q2hlY2sgRHVwbGljYXRlcyBieQ==</PHRASE>
-			<PHRASE Label="la_fld_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>			
+			<PHRASE Label="la_fld_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>
 			<PHRASE Label="la_fld_Comments" Module="Core" Type="1">RGVzY3JpcHRpb24=</PHRASE>
 			<PHRASE Label="la_fld_Company" Module="Core" Type="1">Q29tcGFueQ==</PHRASE>
 			<PHRASE Label="la_fld_CopyLabels" Module="Core" Type="1">Q29weSBMYWJlbHMgZnJvbSB0aGlzIExhbmd1YWdl</PHRASE>
@@ -2374,8 +2374,6 @@
 			<PHRASE Label="lu_comm_CartChangedAfterLogin" Module="Core" Type="0">UHJpY2VzIG9mIG9uZSBvciBtb3JlIGl0ZW1zIGluIHlvdXIgc2hvcHBpbmcgY2FydCBoYXZlIGJlZW4gY2hhbmdlZCBkdWUgdG8geW91ciBsb2dpbiwgcGxlYXNlIHJldmlldyBjaGFuZ2VzLg==</PHRASE>
 			<PHRASE Label="lu_comm_EmailAddress" Module="Core" Type="0">RW1haWxBZGRyZXNz</PHRASE>
 			<PHRASE Label="lu_comm_Go" Module="Core" Type="0">R28=</PHRASE>
-			<PHRASE Label="lu_comm_Images" Module="Core" Type="0">QWRkaXRpb25hbCBJbWFnZXM=</PHRASE>
-			<PHRASE Label="lu_comm_ImagesHeader" Module="Core" Type="0">QURESVRJT05BTCBJTUFHRVM=</PHRASE>
 			<PHRASE Label="lu_comm_NoPermissions" Module="Core" Type="0">Tm8gUGVybWlzc2lvbnM=</PHRASE>
 			<PHRASE Label="lu_comm_Page" Module="Core" Type="0">UGFnZQ==</PHRASE>
 			<PHRASE Label="lu_comm_ProductDescription" Module="Core" Type="0">UHJvZHVjdCBEZXNjcmlwdGlvbg==</PHRASE>