Index: branches/5.1.x/core/admin_templates/import/import_start.tpl
===================================================================
diff -u -r13664 -r13949
--- branches/5.1.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 13664)
+++ branches/5.1.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 13949)
@@ -38,9 +38,9 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
-		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="adm" field="ImportFile" title="!la_fld_ImportFile!"/>
+		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="adm" field="ImportFile" title="la_fld_ImportFile"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 		<!--<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.import" field="ImportOverwrite" hint_label="la_importlang_phrasewarning" title="la_prompt_overwritephrases"/>-->
 	</table>
Index: branches/5.1.x/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -r13545 -r13949
--- branches/5.1.x/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 13545)
+++ branches/5.1.x/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 13949)
@@ -59,28 +59,28 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="cf" field="CustomFieldId" title="!la_prompt_FieldId!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="MultiLingual" title="!la_fld_MultiLingual!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="cf" field="CustomFieldId" title="la_prompt_FieldId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="FieldName" title="la_prompt_FieldName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="FieldLabel" title="la_prompt_FieldLabel" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="MultiLingual" title="la_fld_MultiLingual"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_tab_AdminUI!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="!la_prompt_showgeneraltab!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Heading" title="!la_prompt_heading!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" has_empty="1" onchange="update_layout();"/>
+		<inp2:m_RenderElement name="subsection" title="la_tab_AdminUI"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="la_prompt_showgeneraltab"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Heading" title="la_prompt_heading" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Prompt" title="la_prompt_FieldPrompt" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="la_prompt_InputType" size="20" has_empty="1" onchange="update_layout();"/>
 
 			<inp2:m_if check="cf_Field" name="ElementType" equals_to="select|multiselect|radio" db="db" inverse="inverse">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="ValueList" title="la_prompt_valuelist" size="40"/>
 			</inp2:m_if>
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="IsRequired" title="la_fld_IsRequired"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="DefaultValue" title="la_prompt_Default"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="DisplayOrder" title="!la_field_displayorder!" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="DisplayOrder" title="la_field_displayorder" size="10"/>
 
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="IsSystem" title="!la_fld_IsSystem!"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="IsSystem" title="la_fld_IsSystem"/>
 			</inp2:m_if>
 
 		<inp2:m_if check="cf_Field" name="ElementType" equals_to="select|multiselect|radio" db="db">
Index: branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -r13151 -r13949
--- branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 13151)
+++ branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 13949)
@@ -34,17 +34,17 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
-			<!--## <inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="!la_fld_EventType!"/> ##-->
+			<!--## <inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="la_fld_EventType"/> ##-->
 
 			<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="l{$language_id}_Subject" title="!la_fld_Subject!" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="MessageType" title="!la_fld_MessageType!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Headers" title="!la_fld_ExtraHeaders!" allow_html="0" control_options="{min_height: 50}" rows="3" cols="60"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="l{$language_id}_Subject" title="la_fld_Subject" size="60"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="MessageType" title="la_fld_MessageType"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Headers" title="la_fld_ExtraHeaders" allow_html="0" control_options="{min_height: 50}" rows="3" cols="60"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Message!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="l{$language_id}_Body" title="!la_fld_MessageBody!" control_options="{min_height: 200}" rows="20" cols="85"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Message"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="l{$language_id}_Body" title="la_fld_MessageBody" control_options="{min_height: 200}" rows="20" cols="85"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/categories/related_searches_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/categories/related_searches_edit.tpl	(.../related_searches_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/categories/related_searches_edit.tpl	(.../related_searches_edit.tpl)	(revision 13949)
@@ -29,14 +29,14 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="c-search" fields="ResourceId,ItemType,RelatedSearchId,Keyword,Enabled,Priority" title="!la_section_Relation!"/>
+		<inp2:m_RenderElement name="subsection" prefix="c-search" fields="ResourceId,ItemType,RelatedSearchId,Keyword,Enabled,Priority" title="la_section_Relation"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-search" field="ResourceId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-search" field="ItemType"/>
 
 			<inp2:m_RenderElement name="inp_id_label" prefix="c-search" field="RelatedSearchId" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c-search" field="Keyword" title="!la_fld_RelatedSearchKeyword!" size="50"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-search" field="Enabled" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c-search" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c-search" field="Keyword" title="la_fld_RelatedSearchKeyword" size="50"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-search" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c-search" field="Priority" title="la_fld_Priority" size="4"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/ban_rules/ban_rule_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/ban_rules/ban_rule_edit.tpl	(.../ban_rule_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/ban_rules/ban_rule_edit.tpl	(.../ban_rule_edit.tpl)	(revision 13949)
@@ -62,7 +62,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-	<inp2:m_RenderElement name="subsection" prefix="ban-rule" fields="RuleId,RuleType,ItemField,ItemVerb,ItemValue,ErrorTag,Priority,Status" title="!la_section_General!"/>
+	<inp2:m_RenderElement name="subsection" prefix="ban-rule" fields="RuleId,RuleType,ItemField,ItemVerb,ItemValue,ErrorTag,Priority,Status" title="la_section_General"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="ban-rule" field="ItemType"/>
 
 		<inp2:m_RenderElement name="inp_id_label" prefix="ban-rule" field="RuleId" title="la_fld_Id"/>
Index: branches/5.1.x/core/admin_templates/stylesheets/stylesheets_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 13949)
@@ -55,13 +55,13 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="css" fields="StylesheetId,Name,Description,AdvancedCSS,Enabled" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="css" fields="StylesheetId,Name,Description,AdvancedCSS,Enabled" title="la_section_General"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="css" field="StylesheetId" title="!la_fld_StylesheetId!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="css" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="css" field="Description" title="!la_fld_Description!" control_options="{min_height: 100}" rows="10" cols="40"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="css" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" control_options="{min_height: 100}" rows="10" cols="40"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="css" field="StylesheetId" title="la_fld_StylesheetId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="css" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="css" field="Description" title="la_fld_Description" control_options="{min_height: 100}" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="css" field="AdvancedCSS" title="la_fld_AdvancedCSS" control_options="{min_height: 100}" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="css" field="Enabled" title="la_fld_Enabled"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/users/user_edit_items.tpl
===================================================================
diff -u -r13545 -r13949
--- branches/5.1.x/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 13545)
+++ branches/5.1.x/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 13949)
@@ -130,7 +130,7 @@
 <div id="scroll_container" mode="minimal">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Login" title="la_section_General"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 		<inp2:m_RenderElement name="subsection" title="la_section_Items"/>
Index: branches/5.1.x/core/admin_templates/regional/languages_import.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 13949)
@@ -31,14 +31,14 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
-		<inp2:m_RenderElement name="inp_edit_upload" prefix="phrases.import" field="LangFile" title="!la_fld_LanguageFile!"/>
+		<inp2:m_RenderElement name="inp_edit_upload" prefix="phrases.import" field="LangFile" title="la_fld_LanguageFile"/>
 
-		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.import" field="PhraseType" title="!la_fld_InstallPhraseTypes!"/>
+		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.import" field="PhraseType" title="la_fld_InstallPhraseTypes"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.import" field="ImportOverwrite" hint_label="la_importlang_phrasewarning" title="la_prompt_overwritephrases"/>
 
-		<!-- <inp2:m_RenderElement name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="!la_fld_InstallModules!" /> -->
+		<!-- <inp2:m_RenderElement name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="la_fld_InstallModules" /> -->
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl
===================================================================
diff -u -r13926 -r13949
--- branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl	(.../email_message_settings.tpl)	(revision 13926)
+++ branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl	(.../email_message_settings.tpl)	(revision 13949)
@@ -145,7 +145,7 @@
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Replacement" title="la_fld_Replacement"control_options="{height: 60}"/>
 			<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents" field="ReplacementTagsXML" title="la_fld_ReplacementTags" allow_move="0" format="#Tag# = #Replacement#" style="width: 600px; height: 100px;"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Enabled,Description,FrontEndOnly,Type,MessageType,Headers,Module" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Enabled,Description,FrontEndOnly,Type,MessageType,Headers,Module" title="la_section_General"/>
 			<inp2:m_if check="m_IsDebugMode">
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="Enabled" title="la_fld_Enabled"/>
 			</inp2:m_if>
Index: branches/5.1.x/core/admin_templates/users/image_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 13949)
@@ -31,22 +31,22 @@
 
 <div id="scroll_container">
 	<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="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_Id!"/>
+			<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"/>
+			<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"/>
 
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Priority" title="la_fld_Priority" size="5"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_ThumbnailImage"/>
 			<inp2:m_RenderElement name="thumbnail_section" prefix="u-img"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_FullSizeImage"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
 			<inp2:m_RenderElement name="fullsize_section" prefix="u-img"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
Index: branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -r13151 -r13949
--- branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 13151)
+++ branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 13949)
@@ -72,18 +72,18 @@
 	<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
 
 	<inp2:m_if check="m_Get" name="simple_mode">
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
 	<inp2:m_else/>
 		<tr class="subsectiontitle">
 			<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
 		</tr>
 
-		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="!la_fld_PrimaryTranslation!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="!la_fld_Phrase!" size="60"/>
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
+		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="la_fld_PrimaryTranslation"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="la_fld_Phrase" size="60"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
 
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="!la_fld_PhraseType!"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="!la_fld_Module!"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="la_fld_PhraseType"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="la_fld_Module"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
Index: branches/5.1.x/core/admin_templates/groups/groups_edit.tpl
===================================================================
diff -u -r13892 -r13949
--- branches/5.1.x/core/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 13892)
+++ branches/5.1.x/core/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 13949)
@@ -74,14 +74,14 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="g" fields="GroupId,Name,FrontRegistration,Description,Enabled" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="g" field="GroupId" title="!la_fld_GroupId!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="g" field="Name" title="!la_fld_GroupName!"/>
+		<inp2:m_RenderElement name="subsection" prefix="g" fields="GroupId,Name,FrontRegistration,Description,Enabled" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="g" field="GroupId" title="la_fld_GroupId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="g" field="Name" title="la_fld_GroupName"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="g" field="FrontRegistration" title="la_fld_FrontRegistration"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="Description" title="!la_fld_Description!" control_options="{max_height: 100}"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="Description" title="la_fld_Description" control_options="{max_height: 100}"/>
 
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="g" field="Enabled" title="!la_fld_Enabled!"/>
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="g" field="Enabled" title="la_fld_Enabled"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="m_CheckPermission" permissions="in-portal:user_groups.advanced:manage_permissions" system="1">
Index: branches/5.1.x/core/admin_templates/themes/themes_edit.tpl
===================================================================
diff -u -r12657 -r13949
--- branches/5.1.x/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 13949)
@@ -55,7 +55,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="theme" fields="ThemeId,Name,Description,Enabled,CacheTimeout,StylesheetId,PrimaryTheme" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="theme" fields="ThemeId,Name,Description,Enabled,CacheTimeout,StylesheetId,PrimaryTheme" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="theme" field="ThemeId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="theme" field="Name" title="la_fld_Name"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="theme" field="Description" title="la_fld_Description" cols="25" rows="3"/>
Index: branches/5.1.x/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r13461 -r13949
--- branches/5.1.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 13461)
+++ branches/5.1.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 13949)
@@ -63,23 +63,23 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="c" fields="CategoryId,Name,Description,CreatedById,AutomaticFilename,Filename,SymLinkCategoryId" title="!la_section_Category!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_PageTitle!" size="70"/> <!-- la_fld_Name -->
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" control_options="{min_height: 60}" rows="4" cols="70"/>
+		<inp2:m_RenderElement name="subsection" prefix="c" fields="CategoryId,Name,Description,CreatedById,AutomaticFilename,Filename,SymLinkCategoryId" title="la_section_Category"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="la_fld_CategoryId"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="la_fld_PageTitle" size="70"/> <!-- la_fld_Name -->
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="la_fld_Description" control_options="{min_height: 60}" rows="4" cols="70"/>
 			<inp2:m_RenderElement name="inp_edit_user" prefix="c" field="CreatedById" title="la_fld_CreatedById" size="30" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="la_fld_AutoCreateFileName" onclick="reflectFilename()"/> <!-- la_fld_CategoryAutomaticFilename -->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="la_fld_Filename" size="70" /> <!-- la_fld_CategoryFilename -->
 			<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
 		<inp2:m_RenderElement name="subsection" prefix="c" fields="Title,MenuTitle,FriendlyURL,ParentId,Template,FormId,FormSubmittedTemplate,IsMenu" title="la_section_Page"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Title" title="!la_fld_PageContentTitle!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="MenuTitle" title="!la_fld_PageMentTitle!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Title" title="la_fld_PageContentTitle" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="MenuTitle" title="la_fld_PageMentTitle" size="40"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="FriendlyURL" title="la_fld_FriendlyURL" size="63"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="ParentId" title="la_fld_ParentSection"/>
 
-<!--			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="IsSystem" title="!la_fld_IsSystemTemplate!" onchange="OnSystemClick()"/>-->
+<!--			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="IsSystem" title="la_fld_IsSystemTemplate" onchange="OnSystemClick()"/>-->
 
 			<inp2:m_if check="c_Field" name="IsSystem" equals_to="1" db="db">
 				<inp2:m_if check="m_IsDebugMode">
@@ -89,26 +89,26 @@
 				<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="Template" title="la_fld_TemplateType" size="40"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="FormId" title="!la_fld_Form!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="FormId" title="la_fld_Form"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="FormSubmittedTemplate" title="la_fld_FormSubmittedTemplate" size="60"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="IsMenu" title="la_fld_MenuStatus"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="c" fields="Status,NewItem,EditorsPick,Priority,UseMenuIconUrl,MenuIconUrl,UseExternalUrl,ExternalUrl,CreatedOn,MetaKeywords,MetaDescription,IndexTools" title="!la_section_Properties!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
+		<inp2:m_RenderElement name="subsection" prefix="c" fields="Status,NewItem,EditorsPick,Priority,UseMenuIconUrl,MenuIconUrl,UseExternalUrl,ExternalUrl,CreatedOn,MetaKeywords,MetaDescription,IndexTools" title="la_section_Properties"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="la_fld_New"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="la_fld_EditorsPick"/>
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="Priority" title="la_fld_Priority"/>
 
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="UseMenuIconUrl" title="!la_fld_UseMenuIcon!" onclick="reflectMenuIcon();"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="MenuIconUrl" title="!la_fld_MenuIcon!" size="60"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="UseMenuIconUrl" title="la_fld_UseMenuIcon" onclick="reflectMenuIcon();"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="MenuIconUrl" title="la_fld_MenuIcon" size="60"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="UseExternalUrl" title="la_fld_UseExternalUrl" onclick="reflectExternalUrl();"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="ExternalUrl" title="la_fld_ExternalUrl" size="60"/>
 
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" allow_html="0" control_options="{min_height: 50}" rows="3" cols="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" allow_html="0" control_options="{min_height: 50}" rows="4" cols="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="IndexTools" title="!la_fld_TrackingCode!" control_options="{min_height: 50}" allow_html="0"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="la_fld_CreatedOn"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="la_fld_MetaKeywords" allow_html="0" control_options="{min_height: 50}" rows="3" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="la_fld_MetaDescription" allow_html="0" control_options="{min_height: 50}" rows="4" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="IndexTools" title="la_fld_TrackingCode" control_options="{min_height: 50}" allow_html="0"/>
 
 		<inp2:m_RenderElement name="subsection" prefix="c" fields="EnablePageCache,OverridePageCacheKey,PageCacheKey,PageExpiration" title="la_section_PageCaching"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EnablePageCache" title="la_fld_EnablePageCache" onclick="reflectCachingSettings();"/>
Index: branches/5.1.x/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -r13926 -r13949
--- branches/5.1.x/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 13926)
+++ branches/5.1.x/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 13949)
@@ -31,15 +31,15 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
 		<inp2:m_RenderElement design="form_row" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName">
 			<td class="control-cell">
 				<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field='LangFile'/>" id="<inp2:phrases.export_InputName field='LangFile'/>" value="<inp2:phrases.export_Field field='LangFile'/>" />
 			</td>
 		</inp2:m_RenderElement>
 
-		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/>
+		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.export" field="PhraseType" title="la_fld_ExportPhraseTypes"/>
 
 		<inp2:m_DefineElement name="export_module_element">
 			<tr>
@@ -106,10 +106,10 @@
 			</td>
 		</inp2:m_RenderElement>
 
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportPhrases" title="!la_fld_ExportPhrases!" allow_html="0" hint_label="la_hint_ExportPhrases"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportEmailEvents" title="!la_fld_ExportEmailEvents!" allow_html="0" hint_label="la_hint_ExportEmailEvents"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportPhrases" title="la_fld_ExportPhrases" allow_html="0" hint_label="la_hint_ExportPhrases"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportEmailEvents" title="la_fld_ExportEmailEvents" allow_html="0" hint_label="la_hint_ExportEmailEvents"/>
 
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.export" field="DoNotEncode" title="!la_fld_DoNotEncode!"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.export" field="DoNotEncode" title="la_fld_DoNotEncode"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 13949)
@@ -30,7 +30,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
 		<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
 		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
 		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
Index: branches/5.1.x/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r13926 -r13949
--- branches/5.1.x/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 13926)
+++ branches/5.1.x/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 13949)
@@ -89,50 +89,50 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="!la_Font!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font" title="!la_fld_Font!" size="50"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-family" title="!la_fld_FontFamily!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_color" prefix="selectors" field="SelectorData" subfield="color" title="!la_fld_FontColor!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-size" title="!la_fld_FontSize!"/>
-			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="font-style" value_field="FontStyle" title="!la_fld_FontStyle!"/>
-			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="font-weight" value_field="FontWeight" title="!la_fld_FontWeight!"/>
-			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="text-align" value_field="TextAlign" title="!la_fld_TextAlign!"/>
-			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="text-decoration" value_field="TextDecoration" title="!la_fld_TextDecoration!"/>
-		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="!la_Background!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background" title="!la_fld_Background!" size="50"/>
-			<inp2:m_RenderElement name="inp_edit_color" prefix="selectors" field="SelectorData" subfield="background-color" title="!la_fld_BackgroundColor!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-image" title="!la_fld_BackgroundImage!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-repeat" title="!la_fld_BackgroundRepeat!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-attachment" title="!la_fld_BackgroundAttachment!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-position" title="!la_fld_BackgroundPosition!"/>
-		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="!la_Borders!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border" title="!la_fld_Borders!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-top" title="!la_fld_BorderTop!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-right" title="!la_fld_BorderRight!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-bottom" title="!la_fld_BorderBottom!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-left" title="!la_fld_BorderLeft!"/>
-		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="!la_Paddings!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding" title="!la_fld_Paddings!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-top" title="!la_fld_PaddingTop!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-right" title="!la_fld_PaddingRight!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-bottom" title="!la_fld_PaddingBottom!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-left" title="!la_fld_PaddingLeft!"/>
-		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="!la_Margins!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin" title="!la_fld_Margins!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-top" title="!la_fld_MarginTop!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-right" title="!la_fld_MarginRight!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-bottom" title="!la_fld_MarginBottom!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-left" title="!la_fld_MarginLeft!"/>
-		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="!la_PositionAndVisibility!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="width" title="!la_fld_Width!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="height" title="!la_fld_Height!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="left" title="!la_fld_Left!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="top" title="!la_fld_Top!"/>
-			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="position" value_field="StylePosition" title="!la_fld_Position!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="z-index" title="!la_fld_Z-Index!"/>
-			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="display" value_field="StyleDisplay" title="!la_fld_Display!"/>
-			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="visibility" value_field="StyleVisibility" title="!la_fld_Visibility!"/>
-			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="cursor" value_field="StyleCursor" title="!la_fld_Cursor!"/>
+		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="la_Font"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font" title="la_fld_Font" size="50"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-family" title="la_fld_FontFamily" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_color" prefix="selectors" field="SelectorData" subfield="color" title="la_fld_FontColor"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-size" title="la_fld_FontSize"/>
+			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="font-style" value_field="FontStyle" title="la_fld_FontStyle"/>
+			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="font-weight" value_field="FontWeight" title="la_fld_FontWeight"/>
+			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="text-align" value_field="TextAlign" title="la_fld_TextAlign"/>
+			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="text-decoration" value_field="TextDecoration" title="la_fld_TextDecoration"/>
+		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="la_Background"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background" title="la_fld_Background" size="50"/>
+			<inp2:m_RenderElement name="inp_edit_color" prefix="selectors" field="SelectorData" subfield="background-color" title="la_fld_BackgroundColor"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-image" title="la_fld_BackgroundImage"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-repeat" title="la_fld_BackgroundRepeat"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-attachment" title="la_fld_BackgroundAttachment"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-position" title="la_fld_BackgroundPosition"/>
+		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="la_Borders"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border" title="la_fld_Borders"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-top" title="la_fld_BorderTop"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-right" title="la_fld_BorderRight"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-bottom" title="la_fld_BorderBottom"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-left" title="la_fld_BorderLeft"/>
+		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="la_Paddings"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding" title="la_fld_Paddings"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-top" title="la_fld_PaddingTop"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-right" title="la_fld_PaddingRight"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-bottom" title="la_fld_PaddingBottom"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-left" title="la_fld_PaddingLeft"/>
+		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="la_Margins"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin" title="la_fld_Margins"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-top" title="la_fld_MarginTop"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-right" title="la_fld_MarginRight"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-bottom" title="la_fld_MarginBottom"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-left" title="la_fld_MarginLeft"/>
+		<inp2:m_RenderElement name="subsection_collapse" prefix="selectors" fields="SelectorData" title="la_PositionAndVisibility"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="width" title="la_fld_Width"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="height" title="la_fld_Height"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="left" title="la_fld_Left"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="top" title="la_fld_Top"/>
+			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="position" value_field="StylePosition" title="la_fld_Position"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="z-index" title="la_fld_Z-Index"/>
+			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="display" value_field="StyleDisplay" title="la_fld_Display"/>
+			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="visibility" value_field="StyleVisibility" title="la_fld_Visibility"/>
+			<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="cursor" value_field="StyleCursor" title="la_fld_Cursor"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/themes/file_edit.tpl
===================================================================
diff -u -r12657 -r13949
--- branches/5.1.x/core/admin_templates/themes/file_edit.tpl	(.../file_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/themes/file_edit.tpl	(.../file_edit.tpl)	(revision 13949)
@@ -39,8 +39,8 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="theme-file" fields="FileId,FileName,FilePath,Description,FileContents" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="theme-file" field="FileId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="subsection" prefix="theme-file" fields="FileId,FileName,FilePath,Description,FileContents" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="theme-file" field="FileId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="FileName" title="la_fld_FileName"/>
 			<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="FilePath" title="la_fld_FilePath"/>
 			<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="Description" title="la_fld_Description"/>
Index: branches/5.1.x/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -r13926 -r13949
--- branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 13926)
+++ branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 13949)
@@ -72,11 +72,11 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="skin" field="SkinId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="skin" field="SkinId" title="la_fld_Id"/>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="skin" field="Name" title="!la_fld_SkinName!" style="width: 100px"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="skin" field="Name" title="la_fld_SkinName" style="width: 100px"/>
 
-		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="Logo" title="!la_fld_Logo!"/>
+		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="Logo" title="la_fld_Logo"/>
 		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoBottom" title="la_fld_LogoBottom"/>
 		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoLogin" title="la_fld_LogoLogin"/>
 
@@ -267,7 +267,7 @@
 			</td>
 		</inp2:m_RenderElement>
 
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="skin" field="CSS" title="!la_fld_CSS!" control_options="{min_height: 300}"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="skin" field="CSS" title="la_fld_CSS" control_options="{min_height: 300}"/>
 
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/reviews/review_direct_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 13949)
@@ -33,16 +33,16 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="$prefix" fields="ItemId,TextFormat,ReviewId,CreatedById,ReviewText,Rating" title="!la_Text_Review!"/>
+		<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_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!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="$prefix" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Priority" title="!la_fld_Priority!" size="3" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="$prefix" field="CreatedOn" title="!la_fld_CreatedOn!" size="20" class="text"/>
+			<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"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="$prefix" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Priority" title="la_fld_Priority" size="3" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="$prefix" field="CreatedOn" title="la_fld_CreatedOn" size="20" class="text"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 13949)
@@ -71,18 +71,18 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="selectors" fields="SelectorId,SelectorName,ParentId,Name,Description,AdvancedCSS" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="selectors" fields="SelectorId,SelectorName,ParentId,Name,Description,AdvancedCSS" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
 			<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="2">
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="selectors" field="SelectorId" title="la_fld_SelectorId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorName" title="la_fld_SelectorName" size="40"/>
 
-			<inp2:m_RenderElement name="inp_edit_options" prefix="selectors" field="ParentId" title="!la_fld_SelectorBase!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="selectors" field="ParentId" title="la_fld_SelectorBase"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="la_fld_Description" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="la_fld_AdvancedCSS" rows="10" cols="40"/>
 
 			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_inc param="tab_index" by="1"/>
Index: branches/5.1.x/core/admin_templates/languages/phrase_edit.tpl
===================================================================
diff -u -r13151 -r13949
--- branches/5.1.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 13151)
+++ branches/5.1.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 13949)
@@ -73,18 +73,18 @@
 
 <inp2:m_DefineElement name="phrase_element">
 	<inp2:m_if check="m_Get" name="simple_mode">
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
 	<inp2:m_else/>
 		<tr class="subsectiontitle">
 			<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
 		</tr>
 
-		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="!la_fld_PrimaryTranslation!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="!la_fld_Phrase!" size="60"/>
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
+		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="la_fld_PrimaryTranslation"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="la_fld_Phrase" size="60"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
 
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="!la_fld_PhraseType!"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="!la_fld_Module!"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="la_fld_PhraseType"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="la_fld_Module"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
Index: branches/5.1.x/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 13949)
@@ -64,15 +64,15 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="selectors" fields="SelectorId,SelectorName,Name,Description,AdvancedCSS" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="selectors" fields="SelectorId,SelectorName,Name,Description,AdvancedCSS" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
 			<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="1">
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="selectors" field="SelectorId" title="la_fld_SelectorId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorName" title="la_fld_SelectorName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="la_fld_Description" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="la_fld_AdvancedCSS" rows="10" cols="40"/>
 
 			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_inc param="tab_index" by="1"/>
Index: branches/5.1.x/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r12657 -r13949
--- branches/5.1.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 13949)
@@ -57,27 +57,27 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="lang" field="LanguageId" title="!la_fld_LanguageId!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="PackName" title="!la_fld_PackName!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="LocalName" title="!la_fld_LocalName!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Charset" title="!la_fld_Charset!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconURL" title="!la_fld_IconURL!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconDisabledURL" title="!la_fld_IconDisabledURL!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DateFormat" title="!la_fld_DateFormat!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="TimeFormat" title="!la_fld_TimeFormat!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="lang" field="LanguageId" title="la_fld_LanguageId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="PackName" title="la_fld_PackName"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="LocalName" title="la_fld_LocalName"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Charset" title="la_fld_Charset"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconURL" title="la_fld_IconURL"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconDisabledURL" title="la_fld_IconDisabledURL"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DateFormat" title="la_fld_DateFormat"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="TimeFormat" title="la_fld_TimeFormat"/>
 
-			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputDateFormat" title="!la_fld_InputDateFormat!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputTimeFormat" title="!la_fld_InputTimeFormat!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputDateFormat" title="la_fld_InputDateFormat"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputTimeFormat" title="la_fld_InputTimeFormat"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DecimalPoint" title="!la_fld_DecimalPoint!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ThousandSep" title="!la_fld_ThousandSep!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="!la_fld_PrimaryLang!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DecimalPoint" title="la_fld_DecimalPoint"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ThousandSep" title="la_fld_ThousandSep"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="la_fld_PrimaryLang"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="AdminInterfaceLang" title="la_fld_AdminInterfaceLang"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Priority" title="la_fld_Priority"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="Locale" title="!la_fld_Locale!"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="la_fld_UnitSystem"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="Locale" title="la_fld_Locale"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="FilenameReplacements" title="la_fld_FilenameReplacements" allow_html="0" control_options="{min_height: 200}" cols="50" rows="10"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="UserDocsUrl" title="la_fld_UserDocsUrl"/>
 
Index: branches/5.1.x/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r12657 -r13949
--- branches/5.1.x/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 13949)
@@ -63,7 +63,7 @@
 <input type="hidden" name="user_group" value="11"/>
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
 		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
 		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
Index: branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl
===================================================================
diff -u -r13635 -r13949
--- branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 13635)
+++ branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 13949)
@@ -55,7 +55,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="EventId,Description,Subject" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="EventId,Description,Subject" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
 
 			<inp2:m_if check="m_IsDebugMode">
@@ -67,7 +67,7 @@
 			<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Description" title="la_fld_Description"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="Subject" format="no_default" title="la_fld_Subject"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Body" title="!la_section_Message!"/>
+		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Body" title="la_section_Message"/>
 			<inp2:m_if check="m_IsDebugMode">
 				<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="Body" format="no_default" title="la_fld_MessageBody" control_options="{min_height: 200}"/>
 			<inp2:m_else/>
Index: branches/5.1.x/core/admin_templates/popups/translator.tpl
===================================================================
diff -u -r12657 -r13949
--- branches/5.1.x/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 13949)
@@ -33,14 +33,14 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="trans" field="Language"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="trans" fields="Original,SwitchLanguage,Translation" title="!la_section_Translation!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="trans" title="!la_fld_PrimaryTranslation!" field="Original"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="trans" field="SwitchLanguage" title="!la_fld_Language!" size="50" onchange="submit_event('trans', 'OnChangeLanguage')"/>
+		<inp2:m_RenderElement name="subsection" prefix="trans" fields="Original,SwitchLanguage,Translation" title="la_section_Translation"/>
+			<inp2:m_RenderElement name="inp_label" prefix="trans" title="la_fld_PrimaryTranslation" field="Original"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="trans" field="SwitchLanguage" title="la_fld_Language" size="50" onchange="submit_event('trans', 'OnChangeLanguage')"/>
 
 			<inp2:m_if check="m_get" var="trans_multi_line" value="1">
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="trans" field="Translation" title="!la_fld_Translation!" cols="70" rows="13"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="trans" field="Translation" title="la_fld_Translation" cols="70" rows="13"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="trans" field="Translation" title="!la_fld_Translation!" size="50"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="trans" field="Translation" title="la_fld_Translation" size="50"/>
 			</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 
Index: branches/5.1.x/core/admin_templates/forms/forms_edit.tpl
===================================================================
diff -u -r13390 -r13949
--- branches/5.1.x/core/admin_templates/forms/forms_edit.tpl	(.../forms_edit.tpl)	(revision 13390)
+++ branches/5.1.x/core/admin_templates/forms/forms_edit.tpl	(.../forms_edit.tpl)	(revision 13949)
@@ -58,11 +58,11 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="form" field="FormId" title="!la_fld_Id!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="Title" title="!la_fld_Title!" size="100"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="form" field="FormId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="Title" title="la_fld_Title" size="100"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="RequireLogin" title="la_fld_RequireLogin" onclick="reflectSecurutyImage();"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="UseSecurityImage" title="la_fld_UseSecurityImage"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="Description" title="!la_fld_Description!" cols="60" rows="5"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="form" field="Description" title="la_fld_Description" cols="60" rows="5"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/incs/image_blocks.tpl
===================================================================
diff -u -r12657 -r13949
--- branches/5.1.x/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 13949)
@@ -150,5 +150,5 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="image_url_td">
-	<inp2:ImageUrl local_phrase="!la_LocalImage!"/>
+	<inp2:ImageUrl local_phrase="la_LocalImage"/>
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/categories/relations_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 13949)
@@ -47,17 +47,17 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="c-rel" fields="SourceId,SourceType,TargetId,TargetType,RelationshipId,TargetId,Type,Enabled,Priority" title="!la_section_Relation!"/>
+		<inp2:m_RenderElement name="subsection" prefix="c-rel" fields="SourceId,SourceType,TargetId,TargetType,RelationshipId,TargetId,Type,Enabled,Priority" title="la_section_Relation"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="SourceId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="SourceType"/>
 			<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_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!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<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"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c-rel" field="Priority" title="la_fld_Priority" size="4"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/categories/images_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 13949)
@@ -32,22 +32,22 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
+		<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_Id!"/>
+			<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"/>
+			<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"/>
 
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c-img" field="Priority" title="la_fld_Priority" size="5"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_ThumbnailImage"/>
 			<inp2:m_RenderElement name="thumbnail_section" prefix="c-img"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_FullSizeImage"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
 			<inp2:m_RenderElement name="fullsize_section" prefix="c-img"/>
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl
===================================================================
diff -u -r13545 -r13949
--- branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 13545)
+++ branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 13949)
@@ -34,29 +34,29 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="FormFieldId,FieldName,FieldLabel"  title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="formflds" field="FormFieldId" title="!la_prompt_FieldId!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
+		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="FormFieldId,FieldName,FieldLabel"  title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="formflds" field="FormFieldId" title="la_prompt_FieldId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldName" title="la_prompt_FieldName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldLabel" title="la_prompt_FieldLabel" size="40"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid,Visibility,EmailCommunicationRole" title="!la_tab_AdminUI!"/>
-			<!--<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Heading" title="!la_prompt_heading!" size="40"/>-->
-			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="!la_prompt_InputType!" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="Validation" title="!la_prompt_validation!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="formflds" field="ValueList" title="!la_prompt_ValueList!" allow_html="0" cols="40" rows="5"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="DefaultValue" title="!la_prompt_DefaultValue!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Priority" title="!la_field_Priority!" size="10"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="Required" title="!la_fld_Required!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="DisplayInGrid" title="!la_fld_DisplayInGrid!"/>
+		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid,Visibility,EmailCommunicationRole" title="la_tab_AdminUI"/>
+			<!--<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Heading" title="la_prompt_heading" size="40"/>-->
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Prompt" title="la_prompt_FieldPrompt" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="la_prompt_InputType" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="Validation" title="la_prompt_validation"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="formflds" field="ValueList" title="la_prompt_ValueList" allow_html="0" cols="40" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="DefaultValue" title="la_prompt_DefaultValue" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Priority" title="la_field_Priority" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="Required" title="la_fld_Required"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="DisplayInGrid" title="la_fld_DisplayInGrid"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="formflds" field="Visibility" title="la_fld_Visibility"/>
 
 			<inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db">
 				<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="EmailCommunicationRole" title="la_fld_EmailCommunicationRole" has_empty="1"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="IsSystem" title="!la_fld_IsSystem!"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="IsSystem" title="la_fld_IsSystem"/>
 			</inp2:m_if>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
Index: branches/5.1.x/core/admin_templates/logs/change_logs/change_log_edit.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/logs/change_logs/change_log_edit.tpl	(.../change_log_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/logs/change_logs/change_log_edit.tpl	(.../change_log_edit.tpl)	(revision 13949)
@@ -64,20 +64,20 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Page!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="change-log" field="ChangeLogId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLogin" title="!la_fld_Login!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserFirstName" title="!la_fld_FirstName!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLastName" title="!la_fld_LastName!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="SessionLogId" title="!la_fld_SessionLogId!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Action" title="!la_fld_Action!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="OccuredOn" title="!la_fld_OccuredOn!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="MasterPrefix" title="!la_fld_MasterPrefix!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="MasterId" title="!la_fld_MasterId!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Prefix" title="!la_fld_Prefix!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="ItemId" title="!la_fld_ItemId!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Changes" no_special="1" title="!la_fld_Changes!" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="change-log" field="ChangeLogId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLogin" title="la_fld_Login" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserFirstName" title="la_fld_FirstName" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="UserLastName" title="la_fld_LastName" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="SessionLogId" title="la_fld_SessionLogId" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Action" title="la_fld_Action" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="OccuredOn" title="la_fld_OccuredOn" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="MasterPrefix" title="la_fld_MasterPrefix" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="MasterId" title="la_fld_MasterId" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Prefix" title="la_fld_Prefix" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="ItemId" title="la_fld_ItemId" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_label" prefix="change-log" field="Changes" no_special="1" title="la_fld_Changes" style="width: 100px"/>
 
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 
Index: branches/5.1.x/core/admin_templates/regional/languages_export_step2.tpl
===================================================================
diff -u -r12127 -r13949
--- branches/5.1.x/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 13949)
@@ -24,7 +24,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 			<td class="label-cell">
Index: branches/5.1.x/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -r13890 -r13949
--- branches/5.1.x/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 13890)
+++ branches/5.1.x/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 13949)
@@ -62,7 +62,7 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Login,Password" title="la_section_General"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
 			<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
 			<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
Index: branches/5.1.x/core/admin_templates/config/config_search_edit.tpl
===================================================================
diff -u -r12657 -r13949
--- branches/5.1.x/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 13949)
@@ -55,7 +55,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
 			<inp2:m_RenderElement name="inp_id_label" prefix="confs" field="SearchConfigId" title="la_fld_SearchConfigId"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="confs" field="TableName" title="la_fld_TableName"/>