Index: branches/5.1.x/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -N -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">