Index: branches/5.1.x/admin_templates/products/products_edit.tpl
===================================================================
diff -u -N -r13458 -r13946
--- branches/5.1.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 13458)
+++ branches/5.1.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 13946)
@@ -62,27 +62,27 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Product!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="p" field="ProductId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Product"/>
+			<inp2:m_RenderElement name="inp_label" prefix="p" field="ProductId" title="la_fld_Id"/>
 
 			<inp2:m_if check="m_IsDebugMode" >
-				<inp2:m_RenderElement name="inp_label" prefix="p" field="Type" title="!la_fld_ProductType!"/>
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="Type" title="la_fld_ProductType"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="p" field="Name" title="!la_fld_Title!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="SKU" title="!la_fld_SKU!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="p" field="Name" title="la_fld_Title" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="SKU" title="la_fld_SKU" size="70"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="Description" title="!la_fld_Description!" cols="70" rows="5"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="DescriptionExcerpt" title="!la_fld_DescriptionExcerpt!" cols="70" rows="3"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="Description" title="la_fld_Description" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="DescriptionExcerpt" title="la_fld_DescriptionExcerpt" cols="70" rows="3"/>
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Filename" title="la_fld_Filename" size="70"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
 
 			<inp2:m_if check="p_FieldEquals" field="Type" value="1" >
-				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MinQtyFreePromoShipping" title="!la_fld_ProductFreeShipping!" size="5"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MinQtyFreePromoShipping" title="la_fld_ProductFreeShipping" size="5"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="p_FieldEquals" field="Type" value="1">
@@ -107,48 +107,48 @@
 				</td>
 			</tr>
 
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="ManufacturerId" title="!la_fld_Manufacturer!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="ManufacturerId" title="la_fld_Manufacturer" size="4"/>
 
 			<inp2:m_if check="p_FieldEquals" field="Type" value="3">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="!la_fld_Price!" size="5"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="la_fld_Price" size="5"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="p_FieldEquals" field="Type" value="6">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="!la_fld_Price!" size="5"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="la_fld_Price" size="5"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="p_FieldEquals" field="Type" value="1" >
-				<inp2:m_RenderElement name="inp_edit_weight" prefix="p" field="Weight" title="!la_fld_Weight!" size="5"/>
+				<inp2:m_RenderElement name="inp_edit_weight" prefix="p" field="Weight" title="la_fld_Weight" size="5"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MSRP" title="!la_fld_MSRP!" size="5"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="Status" title="!la_fld_Status!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MSRP" title="la_fld_MSRP" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="Status" title="la_fld_Status"/>
 
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="NewItem" title="!la_fld_New!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="HotItem" title="!la_fld_TopSeller!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="PopItem" title="!la_fld_Pop!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="EditorsPick" title="!la_fld_EditorsPick!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="Featured" title="!la_fld_Featured!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="OnSale" title="!la_fld_OnSale!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="NewItem" title="la_fld_New"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="HotItem" title="la_fld_TopSeller"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="PopItem" title="la_fld_Pop"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="EditorsPick" title="la_fld_EditorsPick"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="Featured" title="la_fld_Featured"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="OnSale" title="la_fld_OnSale"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Priority" title="la_fld_Priority" size="4"/>
 
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="CreatedOn" title="!la_fld_CreatedOn!" size="12"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="Expire" title="!la_fld_Expire!" size="12"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="CreatedOn" title="la_fld_CreatedOn" size="12"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="Expire" title="la_fld_Expire" size="12"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MetaKeywords" title="!la_fld_MetaKeywords!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="MetaDescription" title="!la_fld_MetaDescription!" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MetaKeywords" title="la_fld_MetaKeywords" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="MetaDescription" title="la_fld_MetaDescription" cols="70" rows="5"/>
 
 			<inp2:m_if check="p_FieldEquals" field="Type" value="1" >
-				<inp2:m_RenderElement name="subsection" title="!la_section_Backordering!"/>
-					<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="BackOrder" title="!la_fld_BackOrder!"/>
-					<inp2:m_RenderElement name="inp_edit_date_time" format="mm/dd/y" prefix="p" field="BackOrderDate" title="!la_fld_BackOrderDate!" size="12"/>
-					<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="QtyInStockMin" title="!la_fld_QtyInStockMin!" size="4"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Backordering"/>
+					<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="BackOrder" title="la_fld_BackOrder"/>
+					<inp2:m_RenderElement name="inp_edit_date_time" format="mm/dd/y" prefix="p" field="BackOrderDate" title="la_fld_BackOrderDate" size="12"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="QtyInStockMin" title="la_fld_QtyInStockMin" size="4"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Counters!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="CachedRating" title="!la_fld_Rating!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="CachedVotesQty" title="!la_fld_Votes!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Hits" title="!la_fld_QtySold!" size="4"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Counters"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="CachedRating" title="la_fld_Rating" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="CachedVotesQty" title="la_fld_Votes" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Hits" title="la_fld_QtySold" size="4"/>
 			<input type="hidden" name="Hits_original" id="Hits_original" value="<inp2:p_Field name="Hits" db="db" />" />
 
 	<!-- custom fields: begin -->