Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11953 -r11970
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11953)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11970)
@@ -1365,4 +1365,7 @@
 UPDATE `Language` SET UserDocsUrl = 'http://docs.in-portal.org/eng/index.php';
 
 DELETE FROM Modules WHERE Name = 'Proj-Base';
+
+DELETE FROM Phrase WHERE Phrase IN ('la_fld_ImageId', 'la_fld_RelationshipId', 'la_fld_ReviewId', 'la_prompt_CensorhipId', 'my_account_title', 'Next Theme', 'Previous Theme', 'test 1');
+
 UPDATE Modules SET Version = '5.0.0', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/RC/core/admin_templates/users/image_edit.tpl
===================================================================
diff -u -N -r11902 -r11970
--- branches/RC/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 11902)
+++ branches/RC/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 11970)
@@ -33,7 +33,7 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="u-img" fields="ResourceId,ImageId,Name,AltName,Enabled,DefaultImg,Priority" title="!la_section_Image!"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="u-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="u-img" field="ImageId" title="!la_fld_ImageId!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="u-img" field="ImageId" title="!la_fld_Id!"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Name" title="!la_fld_Name!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -N -r11953 -r11970
--- branches/RC/core/install/english.lang	(.../english.lang)	(revision 11953)
+++ branches/RC/core/install/english.lang	(.../english.lang)	(revision 11970)
@@ -798,7 +798,6 @@
 			<PHRASE Label="la_fld_IconDisabledURL" Module="Core" Type="1">SWNvbiBVUkwgKGRpc2FibGVkKQ==</PHRASE>
 			<PHRASE Label="la_fld_IconURL" Module="Core" Type="1">SWNvbiBVUkw=</PHRASE>
 			<PHRASE Label="la_fld_Id" Module="Core" Type="1">SUQ=</PHRASE>
-			<PHRASE Label="la_fld_ImageId" Module="Core" Type="1">SW1hZ2UgSUQ=</PHRASE>
 			<PHRASE Label="la_fld_ImportCategory" Module="Core" Type="1">SW1wb3J0IFNlY3Rpb24=</PHRASE>
 			<PHRASE Label="la_fld_ImportFilename" Module="Core" Type="1">SW1wb3J0IEZpbGVuYW1l</PHRASE>
 			<PHRASE Label="la_fld_IncludeFieldTitles" Module="Core" Type="1">SW5jbHVkZSBmaWVsZCB0aXRsZXM=</PHRASE>
@@ -886,12 +885,10 @@
 			<PHRASE Label="la_fld_ProductFreeShipping" Module="Core" Type="1">TWluaW11bSBxdWFudGl0eSBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
 			<PHRASE Label="la_fld_Rating" Module="Core" Type="1">UmF0aW5n</PHRASE>
 			<PHRASE Label="la_fld_RelatedSearchKeyword" Module="Core" Type="1">S2V5d29yZA==</PHRASE>
-			<PHRASE Label="la_fld_RelationshipId" Module="Core" Type="1">UmVsYXRpb24gSUQ=</PHRASE>
 			<PHRASE Label="la_fld_RelationshipType" Module="Core" Type="1">VHlwZQ==</PHRASE>
 			<PHRASE Label="la_fld_RemoteUrl" Module="Core" Type="1">UmVtb3RlIFVSTA==</PHRASE>
 			<PHRASE Label="la_fld_ReplaceDuplicates" Module="Core" Type="1">UmVwbGFjZSBEdXBsaWNhdGVz</PHRASE>
 			<PHRASE Label="la_fld_Required" Module="Core" Type="1">UmVxdWlyZWQ=</PHRASE>
-			<PHRASE Label="la_fld_ReviewId" Module="Core" Type="0">UmV2aWV3IElE</PHRASE>
 			<PHRASE Label="la_fld_ReviewText" Module="Core" Type="1">UmV2aWV3IFRleHQ=</PHRASE>
 			<PHRASE Label="la_fld_RuleType" Module="Core" Type="1">UnVsZSBUeXBl</PHRASE>
 			<PHRASE Label="la_fld_RunInterval" Module="Core" Type="1">UnVuIEludGVydmFs</PHRASE>
@@ -1188,8 +1185,6 @@
 			<PHRASE Label="la_prompt_CategoryLeadStoryArticles" Module="Core" Type="1">U2VjdGlvbiBMZWFkIFN0b3J5IEFydGljbGVz</PHRASE>
 			<PHRASE Label="la_Prompt_CategoryPermissions" Module="Core" Type="1">U2VjdGlvbiBQZXJtaXNzaW9ucw==</PHRASE>
 			<PHRASE Label="la_prompt_CatLead" Module="Core" Type="1">U2VjdGlvbiBMZWFkIFN0b3J5</PHRASE>
-			<PHRASE Label="la_prompt_CensorhipId" Module="Core" Type="1">Q2Vuc29yc2hpcCBJZA==</PHRASE>
-			<PHRASE Label="la_prompt_CensorWord" Module="Core" Type="1">Q2Vuc29yc2hpcCBXb3Jk</PHRASE>
 			<PHRASE Label="la_prompt_charset" Module="Core" Type="1">Q2hhcnNldA==</PHRASE>
 			<PHRASE Label="la_prompt_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>
 			<PHRASE Label="la_prompt_Comments" Module="Core" Type="1">Q29tbWVudHM=</PHRASE>
@@ -3319,10 +3314,6 @@
 			<PHRASE Label="lu_ZipCode" Module="Core" Type="0">WklQIENvZGU=</PHRASE>
 			<PHRASE Label="lu_zip_code" Module="Core" Type="0">WklQIENvZGU=</PHRASE>
 			<PHRASE Label="lu_zoom" Module="Core" Type="0">Wm9vbQ==</PHRASE>
-			<PHRASE Label="my_account_title" Module="Core" Type="0">TXkgU2V0dGluZ3M=</PHRASE>
-			<PHRASE Label="Next Theme" Module="Core" Type="0">TmV4dCBUaGVtZQ==</PHRASE>
-			<PHRASE Label="Previous Theme" Module="Core" Type="0">UHJldmlvdXMgVGhlbWU=</PHRASE>
-			<PHRASE Label="test 1" Module="Core" Type="0">dGVzdCAy</PHRASE>
 		</PHRASES>
 		<EVENTS>
 			<EVENT MessageType="text" Event="CATEGORY.ADD" Type="0">WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IENhdGVnb3J5IGFkZGVkCgpZb3VyIHN1Z2dlc3RlZCBjYXRlZ29yeSAiPGlucDI6Y19GaWVsZCBuYW1lPSJOYW1lIi8+IiBoYXMgYmVlbiBhZGRlZC4=</EVENT>
Index: branches/RC/core/admin_templates/categories/relations_edit.tpl
===================================================================
diff -u -N -r11902 -r11970
--- branches/RC/core/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 11902)
+++ branches/RC/core/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 11970)
@@ -53,7 +53,7 @@
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="TargetId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="TargetType"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="c-rel" field="RelationshipId" title="!la_fld_RelationshipId!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="c-rel" field="RelationshipId" title="!la_fld_Id!"/>
 			<inp2:m_RenderElement name="inp_edit_relation" prefix="c-rel" field="TargetId" title="!la_fld_TargetId!"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="c-rel" field="Type" title="!la_fld_RelationshipType!"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-rel" field="Enabled" title="!la_fld_Enabled!"/>
Index: branches/RC/core/admin_templates/reviews/review_direct_edit.tpl
===================================================================
diff -u -N -r11902 -r11970
--- branches/RC/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 11902)
+++ branches/RC/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 11970)
@@ -36,7 +36,7 @@
 		<inp2:m_RenderElement name="subsection" prefix="$prefix" fields="ItemId,TextFormat,ReviewId,CreatedById,ReviewText,Rating" title="!la_Text_Review!"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="ItemId"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="$prefix" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="$prefix" field="ReviewId" title="!la_fld_ReviewId!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="$prefix" field="ReviewId" title="!la_fld_Id!"/>
 			<inp2:m_RenderElement name="inp_edit_user" prefix="$prefix" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="$prefix" field="ReviewText" title="!la_fld_ReviewText!" control_options="{min_height: 100}" cols="70" rows="8"/>
 		<inp2:m_RenderElement name="subsection" prefix="$prefix" fields="Status,Priority,CreatedOn" title="!la_Text_General!"/>
Index: branches/RC/core/admin_templates/categories/images_edit.tpl
===================================================================
diff -u -N -r11724 -r11970
--- branches/RC/core/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 11724)
+++ branches/RC/core/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 11970)
@@ -34,7 +34,7 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="c-img" field="ImageId" title="!la_fld_ImageId!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="c-img" field="ImageId" title="!la_fld_Id!"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c-img" field="Name" title="!la_fld_Name!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c-img" field="AltName" title="!la_fld_AltValue!" size="40"/>