Index: branches/5.1.x/admin_templates/export_finish.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/export_finish.tpl	(.../export_finish.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/export_finish.tpl	(.../export_finish.tpl)	(revision 13946)
@@ -25,7 +25,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'/>">
 			<inp2:m_inc param="tab_index" by="1"/>
Index: branches/5.1.x/admin_templates/products/option_combinations.tpl
===================================================================
diff -u -N -r13938 -r13946
--- branches/5.1.x/admin_templates/products/option_combinations.tpl	(.../option_combinations.tpl)	(revision 13938)
+++ branches/5.1.x/admin_templates/products/option_combinations.tpl	(.../option_combinations.tpl)	(revision 13946)
@@ -138,16 +138,16 @@
 
 <div id="scroll_container" style="height: 250px;">
 	<table class="edit-form" style="border-bottom: 1px solid black;">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Combination!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Combination"/>
 			<inp2:po.edit_PrintList2 per_page="-1" selectable_only="1" render_as="option_block" main_special=""/>
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Properties!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Properties"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="poc" field="ProductId"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poc" field="Availability" title="!la_fld_Availability!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="poc" field="PriceType" title="!la_fld_PriceType!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="Price" title="!la_fld_Price!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="SKU" title="!la_fld_SKU!" size="40"/>
-			<!--<inp2:m_RenderElement name="inp_edit_radio" prefix="poc" field="WeightType" title="!la_fld_WeightType!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="Weight" title="!la_fld_Weight!" size="4"/>-->
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poc" field="Availability" title="la_fld_Availability"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="poc" field="PriceType" title="la_fld_PriceType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="Price" title="la_fld_Price" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="SKU" title="la_fld_SKU" size="40"/>
+			<!--<inp2:m_RenderElement name="inp_edit_radio" prefix="poc" field="WeightType" title="la_fld_WeightType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="Weight" title="la_fld_Weight" size="4"/>-->
 			<inp2:m_RenderElement name="combination_buttons"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/import.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13946)
@@ -90,7 +90,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 design="form_row" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename">
 				<td class="control-cell">
 					<table border="0">
Index: branches/5.1.x/admin_templates/products/review_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/review_edit.tpl	(.../review_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/review_edit.tpl	(.../review_edit.tpl)	(revision 13946)
@@ -42,16 +42,16 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Review!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Review"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rev" field="ItemId"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="rev" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_label" prefix="rev" field="ReviewId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="rev" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="rev" field="ReviewText" title="!la_fld_ReviewText!" cols="70" rows="8"/>
-		<inp2:m_RenderElement name="subsection" title="!la_Text_General!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="rev" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="rev" field="Priority" title="!la_fld_Priority!" size="3" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="rev" field="CreatedOn" title="!la_fld_CreatedOn!" size="20" class="text"/>
+			<inp2:m_RenderElement name="inp_label" prefix="rev" field="ReviewId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="rev" field="CreatedById" title="la_fld_CreatedById" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="rev" field="ReviewText" title="la_fld_ReviewText" cols="70" rows="8"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_General"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="rev" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="rev" field="Priority" title="la_fld_Priority" size="3" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="rev" field="CreatedOn" title="la_fld_CreatedOn" size="20" class="text"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/taxes/taxes_edit.tpl
===================================================================
diff -u -N -r13465 -r13946
--- branches/5.1.x/admin_templates/taxes/taxes_edit.tpl	(.../taxes_edit.tpl)	(revision 13465)
+++ branches/5.1.x/admin_templates/taxes/taxes_edit.tpl	(.../taxes_edit.tpl)	(revision 13946)
@@ -164,14 +164,14 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_TaxZone!"/>
-		<inp2:m_RenderElement name="inp_id_label" prefix="tax" field="TaxZoneId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_TaxZone"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="tax" field="TaxZoneId" title="la_fld_Id"/>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="tax" field="Name" title="!la_fld_ZoneName!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="tax" field="TaxValue" title="!la_fld_TaxValue!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="tax" field="ApplyToShipping" title="!la_fld_TaxApplyToShipping!"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="tax" field="ApplyToProcessing" title="!la_fld_TaxApplyToProcessing!"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="tax" field="Type" title="!la_fld_ZoneType!"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="tax" field="Name" title="la_fld_ZoneName" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="tax" field="TaxValue" title="la_fld_TaxValue" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="tax" field="ApplyToShipping" title="la_fld_TaxApplyToShipping"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="tax" field="ApplyToProcessing" title="la_fld_TaxApplyToProcessing"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="tax" field="Type" title="la_fld_ZoneType"/>
 
 		<inp2:m_if check="tax_Field" field="Type" equals_to="1" db="db">
 			<inp2:m_RenderElement name="countries_multiple" prefix="tax" />
Index: branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	(.../affiliate_plans_edit.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	(.../affiliate_plans_edit.tpl)	(revision 13946)
@@ -56,13 +56,13 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="ap" field="AffiliatePlanId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ap" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="ap" field="PlanType" title="!la_fld_PlanType!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="ap" field="ResetInterval" title="!la_fld_Period!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="IsPrimary" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_label" prefix="ap" field="AffiliatePlanId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ap" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="ap" field="PlanType" title="la_fld_PlanType"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="ap" field="ResetInterval" title="la_fld_Period"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="IsPrimary" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="Enabled" title="la_fld_Enabled" onchange="check_primary()"/>
 
 			<inp2:m_RenderElement design="form_row" prefix="ap" field="MinPaymentAmount" title="la_fld_MinimumPaymentAmount">
 				<td class="control-cell">
Index: branches/5.1.x/admin_templates/discounts/coupon_edit.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/discounts/coupon_edit.tpl	(.../coupon_edit.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/discounts/coupon_edit.tpl	(.../coupon_edit.tpl)	(revision 13946)
@@ -76,10 +76,10 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="coup" field="CouponId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="coup" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Name" title="!la_fld_Name!" size="35"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_label" prefix="coup" field="CouponId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="coup" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Name" title="la_fld_Name" size="35"/>
 
 			<inp2:m_RenderElement design="form_row" prefix="coup" field="Code" title="la_fld_CouponCode" size="35">
 				<td class="control-cell">
@@ -88,13 +88,13 @@
 				</td>
 			</inp2:m_RenderElement>
 
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="coup" field="Expiration" title="!la_fld_Expiration!" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="coup" field="Expiration" title="la_fld_Expiration" size="10"/>
 
-			<inp2:m_RenderElement name="inp_edit_options" prefix="coup" field="Type" title="!la_fld_Type!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Amount" title="!la_fld_Amount!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="coup" field="Type" title="la_fld_Type"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Amount" title="la_fld_Amount" size="4"/>
 
-			<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedBy" title="!la_fld_LastUsedBy!" size="15"/>
-			<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedOn" title="!la_fld_LastUsedOn!" size="10"/>
+			<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedBy" title="la_fld_LastUsedBy" size="15"/>
+			<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedOn" title="la_fld_LastUsedOn" size="10"/>
 
 			<inp2:m_RenderElement design="form_row" prefix="coup" field="NumberOfUses" title="la_fld_NumberOfUses" size="4">
 				<td class="control-cell">
Index: branches/5.1.x/admin_templates/products/option_edit.tpl
===================================================================
diff -u -N -r13549 -r13946
--- branches/5.1.x/admin_templates/products/option_edit.tpl	(.../option_edit.tpl)	(revision 13549)
+++ branches/5.1.x/admin_templates/products/option_edit.tpl	(.../option_edit.tpl)	(revision 13946)
@@ -304,15 +304,15 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Option!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Option"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="po" field="ProductId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="po" field="ProductOptionId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Required" title="!la_fld_Required!"/>
-			<!--<inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Listable" title="!la_fld_Listable!"/>-->
-			<inp2:m_RenderElement name="inp_edit_options" prefix="po" field="OptionType" has_empty="1" empty_value="0" title="!la_fld_OptionType!" onchange="update_type(this.value)"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Priority" title="!la_fld_Priority!" size="2"/>
-			<inp2:m_RenderElement name="options_list" prefix="po" field="Values" title="!la_fld_Values!" size="2"/>
+			<inp2:m_RenderElement name="inp_label" prefix="po" field="ProductOptionId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Required" title="la_fld_Required"/>
+			<!--<inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Listable" title="la_fld_Listable"/>-->
+			<inp2:m_RenderElement name="inp_edit_options" prefix="po" field="OptionType" has_empty="1" empty_value="0" title="la_fld_OptionType" onchange="update_type(this.value)"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Priority" title="la_fld_Priority" size="2"/>
+			<inp2:m_RenderElement name="options_list" prefix="po" field="Values" title="la_fld_Values" size="2"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
===================================================================
diff -u -N -r13745 -r13946
--- branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(.../affiliate_plans_brackets.tpl)	(revision 13745)
+++ branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(.../affiliate_plans_brackets.tpl)	(revision 13946)
@@ -162,9 +162,9 @@
 <inp2:apbrackets_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 	<tr nowrap="nowrap" class="grid-header-row-0">
-		<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_FromAmount!"/>
-		<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_ToAmount!"/>
-		<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_Percent!"/>
+		<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_FromAmount"/>
+		<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_ToAmount"/>
+		<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_Percent"/>
 	</tr>
 	<inp2:apbrackets_ShowPricingForm block="prbracket" IdField="AffiliateBracketId"/>
 </table>
Index: branches/5.1.x/admin_templates/products/products_categories.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/products_categories.tpl	(.../products_categories.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_categories.tpl	(.../products_categories.tpl)	(revision 13946)
@@ -73,7 +73,7 @@
 </table>
 
 <inp2:m_DefineElement name="grid_checkbox_category_td">
-	<inp2:CategoryName field="$field" primary_title="!la_PrimaryCategory!" no_special="1"/>
+	<inp2:CategoryName field="$field" primary_title="la_PrimaryCategory" no_special="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="p-ci" IdField="CategoryId" grid="Default"/>
Index: branches/5.1.x/admin_templates/discounts/discount_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/discounts/discount_edit.tpl	(.../discount_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/discounts/discount_edit.tpl	(.../discount_edit.tpl)	(revision 13946)
@@ -58,15 +58,15 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="d" field="DiscountId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="d" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="d" field="Name" title="!la_fld_Name!" size="35"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="d" field="Start" title="!la_fld_Start!" size="10"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="d" field="End" title="!la_fld_End!" size="10"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="d" field="GroupId" title="!la_fld_Group!" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="d" field="Type" title="!la_fld_Type!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="d" field="Amount" title="!la_fld_Amount!" size="4"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_label" prefix="d" field="DiscountId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="d" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="d" field="Name" title="la_fld_Name" size="35"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="d" field="Start" title="la_fld_Start" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="d" field="End" title="la_fld_End" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="d" field="GroupId" title="la_fld_Group" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="d" field="Type" title="la_fld_Type"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="d" field="Amount" title="la_fld_Amount" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/affiliate_plans/affiliates_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/affiliate_plans/affiliates_edit.tpl	(.../affiliates_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/affiliate_plans/affiliates_edit.tpl	(.../affiliates_edit.tpl)	(revision 13946)
@@ -63,18 +63,18 @@
 
 <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="affil" field="AffiliateId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="affil" field="PortalUserId" title="!la_fld_Username!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="affil" field="AffiliatePlanId" title="!la_fld_AffiliatePlan!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="affil" field="PaymentTypeId" title="!la_fld_PaymentType!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="affil" field="SSN" title="!la_fld_SSN!" />
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="affil" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_date" prefix="affil" field="CreatedOn" title="!la_fld_RegisteredOn!" />
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil" field="Comments" title="!la_fld_Comments!" cols="40" rows="5"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="affil" field="AffiliateId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="affil" field="PortalUserId" title="la_fld_Username"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="affil" field="AffiliatePlanId" title="la_fld_AffiliatePlan"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="affil" field="PaymentTypeId" title="la_fld_PaymentType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="affil" field="SSN" title="la_fld_SSN" />
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="affil" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="affil" field="CreatedOn" title="la_fld_RegisteredOn" />
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil" field="Comments" title="la_fld_Comments" cols="40" rows="5"/>
 
 			<inp2:m_if check="affil_IsNewMode" inverse="inverse">
-				<inp2:m_RenderElement name="subsection" title="!la_section_AdvertisingMaterials!"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_AdvertisingMaterials"/>
 					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 						<inp2:m_inc param="tab_index" by="1"/>
 						<td class="label-cell">
@@ -87,7 +87,7 @@
 					</tr>
 					<inp2:m_RenderElement name="inp_label" prefix="affil" field="AffiliateCode" title="la_fld_AffiliateCode"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Statistics!"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Statistics"/>
 					<inp2:m_RenderElement name="inp_label" prefix="affil" field="AccumulatedAmount" title="la_fld_AccumulatedAmount" currency="selected"/>
 					<inp2:m_RenderElement name="inp_label" prefix="affil" field="ItemsSold" title="la_fld_ItemsSold"/>
 					<inp2:m_RenderElement name="inp_label" prefix="affil" field="AmountToPay" title="la_fld_AmountToPay" currency="selected"/>
Index: branches/5.1.x/admin_templates/products/products_inventory.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/products/products_inventory.tpl	(.../products_inventory.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/products/products_inventory.tpl	(.../products_inventory.tpl)	(revision 13946)
@@ -81,15 +81,15 @@
 
 <div id="scroll_container"<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db"> style="height: 142px;"</inp2:m_if>>
 	<table class="edit-form"<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db"> style="border-bottom: 1px solid black;"</inp2:m_if>>
-		<inp2:m_RenderElement name="subsection" title="!la_section_Product!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Product"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="InventoryStatus" title="la_fld_InventoryStatus" onchange="change_inventory_status()"/>
 
 			<inp2:m_ifnot check="p_Field" name="InventoryStatus" db="db" equals_to="2">
 				<!-- inventory by product / inventory disabled -->
-				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyInStock" title="!la_fld_QtyInStock!"/>
-				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyReserved" title="!la_fld_QtyReserved!"/>
-				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyBackOrdered" title="!la_fld_QtyBackOrdered!"/>
-				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyOnOrder" title="!la_fld_QtyOnOrder!"/>
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyInStock" title="la_fld_QtyInStock"/>
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyReserved" title="la_fld_QtyReserved"/>
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyBackOrdered" title="la_fld_QtyBackOrdered"/>
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyOnOrder" title="la_fld_QtyOnOrder"/>
 			</inp2:m_ifnot>
 
 			<inp2:m_RenderElement design="form_row" prefix="p" field="Qty" title="la_fld_Qty" size="3">
@@ -103,7 +103,7 @@
 				</td>
 			</inp2:m_RenderElement>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="InventoryComment" title="!la_fld_Comment!" cols="40" rows="3"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="InventoryComment" title="la_fld_Comment" cols="40" rows="3"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/orders/export/export_finish.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/orders/export/export_finish.tpl	(.../export_finish.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/orders/export/export_finish.tpl	(.../export_finish.tpl)	(revision 13946)
@@ -25,7 +25,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'/>">
 			<inp2:m_inc param="tab_index" by="1"/>
Index: branches/5.1.x/admin_templates/products/products_pricing_grid.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/products_pricing_grid.tpl	(.../products_pricing_grid.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_pricing_grid.tpl	(.../products_pricing_grid.tpl)	(revision 13946)
@@ -69,17 +69,17 @@
 	<inp2:m_DefineElement name="prbracket">
 		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 
-			<inp2:m_RenderElement name="pr_edit_min" IdField="$IdField" PrefixSpecial="pr.tang" field="MinQty" title="!la_fld_Title!" size="40" pass_params="true"/>
+			<inp2:m_RenderElement name="pr_edit_min" IdField="$IdField" PrefixSpecial="pr.tang" field="MinQty" title="la_fld_Title" size="40" pass_params="true"/>
 
-			<inp2:m_RenderElement name="pr_edit_max" IdField="$IdField" PrefixSpecial="pr.tang" field="MaxQty" title="!la_fld_Title!" size="40" pass_params="true"/>
+			<inp2:m_RenderElement name="pr_edit_max" IdField="$IdField" PrefixSpecial="pr.tang" field="MaxQty" title="la_fld_Title" size="40" pass_params="true"/>
 
-			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Cost" title="!la_fld_Title!" size="4" pass_params="true"/>
+			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Cost" title="la_fld_Title" size="4" pass_params="true"/>
 
-			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Price" title="!la_fld_Title!" size="4" pass_params="true"/>
+			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Price" title="la_fld_Title" size="4" pass_params="true"/>
 		<!--##
-			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Points" title="!la_fld_Title!" size="4" pass_params="true"/>
+			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Points" title="la_fld_Title" size="4" pass_params="true"/>
 		##-->
-			<inp2:m_RenderElement name="pr_edit_checkbox" IdField="$IdField" PrefixSpecial="pr.tang" field="Negotiated" title="!la_fld_Title!" pass_params="true"/>
+			<inp2:m_RenderElement name="pr_edit_checkbox" IdField="$IdField" PrefixSpecial="pr.tang" field="Negotiated" title="la_fld_Title" pass_params="true"/>
 
 		</tr>
 	</inp2:m_DefineElement>
@@ -89,14 +89,14 @@
 
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 		<tr nowrap="nowrap" class="grid-header-row-0">
-			<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_minqty!" width="15%"/>
-			<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_maxqty!" width="15%"/>
-			<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_cost!" width="10%"/>
-			<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_price!" width="10%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_minqty" width="15%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_maxqty" width="15%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_cost" width="10%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_price" width="10%"/>
 		<!--##
-			<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_points!" width="10%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_points" width="10%"/>
 		##-->
-			<inp2:m_RenderElement name="pr_grid_th" phrase="!la_col_negotiated!"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_negotiated"/>
 		</tr>
 		<inp2:pr.tang_ShowPricingForm block="prbracket" IdField="PriceId"/>
 	</table>
Index: branches/5.1.x/admin_templates/products/products_options.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/products_options.tpl	(.../products_options.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_options.tpl	(.../products_options.tpl)	(revision 13946)
@@ -115,7 +115,7 @@
 				<a href="javascript:openCombinations();">Open</a>
 			</td>
 		</tr>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="OptionsSelectionMode" title="!la_fld_OptionsSelectionMode!"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="OptionsSelectionMode" title="la_fld_OptionsSelectionMode"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/products/access_pricing_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/access_pricing_edit.tpl	(.../access_pricing_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/access_pricing_edit.tpl	(.../access_pricing_edit.tpl)	(revision 13946)
@@ -29,25 +29,25 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_PriceBracket!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_PriceBracket"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="pr" field="ProductId"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessDuration" title="!la_fld_AccessDuration!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="pr" field="AccessUnit" title="!la_fld_AccessDurationUnit!" size="20"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessDuration" title="la_fld_AccessDuration" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="pr" field="AccessUnit" title="la_fld_AccessDurationUnit" size="20"/>
 
-	<!--	<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessRebillDate" title="!la_fld_AccessRebillDate!" size="5"/> -->
+	<!--	<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessRebillDate" title="la_fld_AccessRebillDate" size="5"/> -->
 
 			<!-- Customization healtheconomics.org -->
 
 	<!--
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="pr" field="DurationType" title="!la_fld_DurationType!"/>
-			<inp2:m_RenderElement name="inp_edit_date" prefix="pr" field="AccessExpiration" title="!la_fld_AccessExpiration!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="pr" field="DurationType" title="la_fld_DurationType"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="pr" field="AccessExpiration" title="la_fld_AccessExpiration"/>
 	-->
 
 			<!-- //Customization healtheconomics.org -->
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Description" title="!la_fld_Description!" size="30"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Price" title="!la_fld_Price!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pr" field="IsPrimary" title="!la_fld_Primary!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Description" title="la_fld_Description" size="30"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Price" title="la_fld_Price" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pr" field="IsPrimary" title="la_fld_Primary"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/export.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13946)
@@ -35,7 +35,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_edit_radio" prefix="p.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="p.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
Index: branches/5.1.x/admin_templates/products/products_access.tpl
===================================================================
diff -u -N -r13809 -r13946
--- branches/5.1.x/admin_templates/products/products_access.tpl	(.../products_access.tpl)	(revision 13809)
+++ branches/5.1.x/admin_templates/products/products_access.tpl	(.../products_access.tpl)	(revision 13946)
@@ -81,16 +81,16 @@
 
 <div id="scroll_container" mode="minimal">
 	<table class="edit-form" style="border-bottom: 1px solid black;">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Product!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Product"/>
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="AccessGroupId" title="la_fld_AccessGroup" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="IsRecurringBilling" title="la_fld_IsRecurringBilling"/>
 			<!-- <inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="PayPalRecurring" title="la_fld_IsPayPalRecurring"/> -->
 
-			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="p" field="AccessDuration" title="!la_fld_AccessDuration!" size="4" /> -->
-			<!-- <inp2:m_RenderElement name="inp_edit_options" prefix="p" field="AccessDurationType" title="!la_fld_AccessDurationType!" size="20"/> -->
-			<!-- <inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessStart" title="!la_fld_AccessStart!" size="10" /> -->
-			<!-- <inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessEnd" title="!la_fld_AccessEnd!" size="10" /> -->
+			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="p" field="AccessDuration" title="la_fld_AccessDuration" size="4" /> -->
+			<!-- <inp2:m_RenderElement name="inp_edit_options" prefix="p" field="AccessDurationType" title="la_fld_AccessDurationType" size="20"/> -->
+			<!-- <inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessStart" title="la_fld_AccessStart" size="10" /> -->
+			<!-- <inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessEnd" title="la_fld_AccessEnd" size="10" /> -->
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13946)
@@ -80,18 +80,18 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_OrderShipping!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_OrderShipping"/>
 
 			<inp2:m_if check="ord_OrderEditable">
 
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="!la_fld_ShippingTo!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="!la_fld_ShippingCompany!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="!la_fld_ShippingPhone!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingFax" title="!la_fld_ShippingFax!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="!la_fld_ShippingEmail!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="!la_fld_ShippingAddress1!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="!la_fld_ShippingAddress2!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="!la_fld_ShippingCity!" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="la_fld_ShippingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="la_fld_ShippingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="la_fld_ShippingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingFax" title="la_fld_ShippingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="la_fld_ShippingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="la_fld_ShippingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="la_fld_ShippingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="la_fld_ShippingCity" size="20"/>
 
 				<script type="text/javascript">
 					function update_address()
@@ -100,15 +100,15 @@
 					}
 				</script>
 
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="!la_fld_ShippingState!" size="20" />
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="!la_fld_ShippingZip!" size="10"/>
-				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="!la_fld_ShippingCountry!" size="20" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="la_fld_ShippingState" size="20" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="la_fld_ShippingZip" size="10"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="la_fld_ShippingCountry" size="20" />
 
 				<inp2:m_DefineElement name="order_option">
 					<input onclick="submit_event('ord','OnQuietPreSave');"  class="simple" type="radio" <inp2:m_param name="checked"/> name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;<br>
 				</inp2:m_DefineElement>
 
-				<!-- <inp2:m_RenderElement name="inp_edit_radio" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOption!" size="20" /> -->
+				<!-- <inp2:m_RenderElement name="inp_edit_radio" prefix="ord" field="ShippingOption" title="la_fld_ShippingOption" size="20" /> -->
 
 				<inp2:m_DefineElement name="order_shipping_type">
 					<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
@@ -154,22 +154,22 @@
 					</td>
 				</tr>
 
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCost" title="!la_fld_ShippingCost!" size="10"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="!la_fld_InsuranceFee!" size="10" currency="selected"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/>
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="!la_fld_ShippingDate!" size="16"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" currency="selected"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCustomerAccount" title="la_fld_ShippingCustomerAccount" size="30"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate" size="16"/>
 
 			<inp2:m_else/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingTo" title="!la_fld_ShippingTo!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCompany" title="!la_fld_ShippingCompany!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingPhone" title="!la_fld_ShippingPhone!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingFax" title="!la_fld_ShippingFax!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingEmail" title="!la_fld_ShippingEmail!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress1" title="!la_fld_ShippingAddress1!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress2" title="!la_fld_ShippingAddress2!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCity" title="!la_fld_ShippingCity!" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingTo" title="la_fld_ShippingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCompany" title="la_fld_ShippingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingPhone" title="la_fld_ShippingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingFax" title="la_fld_ShippingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingEmail" title="la_fld_ShippingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress1" title="la_fld_ShippingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress2" title="la_fld_ShippingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCity" title="la_fld_ShippingCity" size="20"/>
 
 				<script type="text/javascript">
 					function update_address()
@@ -178,16 +178,16 @@
 					}
 				</script>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCountry" title="!la_fld_ShippingCountry!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingState" title="!la_fld_ShippingState!" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCountry" title="la_fld_ShippingCountry" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingState" title="la_fld_ShippingState" size="20"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingZip" title="!la_fld_ShippingZip!" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingZip" title="la_fld_ShippingZip" size="10"/>
 
 				<inp2:m_DefineElement name="order_option_label">
 					<inp2:m_param name="key"/> <inp2:m_phrase label="$option"/>
 				</inp2:m_DefineElement>
 
-				<!--inp2:m_ParseBlock name="inp_edit_radio" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOption!" size="20"/-->
+				<!--inp2:m_ParseBlock name="inp_edit_radio" prefix="ord" field="ShippingOption" title="la_fld_ShippingOption" size="20"/-->
 
 				<inp2:m_DefineElement name="order_shipping_type">
 					<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
@@ -197,7 +197,7 @@
 					<inp2:m_param name="shipment"/> - <inp2:ord_PrintShippingTypes block="order_shipping_type" currency="selected" selected_only="1"/>
 				</inp2:m_DefineElement>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOptions!" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingOption" title="la_fld_ShippingOptions" size="10"/>
 
 				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 					<inp2:m_inc param="tab_index" by="1"/>
@@ -210,10 +210,10 @@
 					</td>
 				</tr>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCost" title="!la_fld_ShippingCost!" size="10" format="$ %.2f"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10" format="$ %.2f"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="!la_fld_InsuranceFee!" size="10" format="$ %.2f"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" format="$ %.2f"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="la_fld_ShippingCustomerAccount" size="30"/>
 
 				<inp2:m_DefineElement name="inp_shipping_label" is_last="" as_label="" currency="" is_last="">
 					<inp2:m_RenderElement design="form_row" pass_params="1">
@@ -227,10 +227,10 @@
 					</inp2:m_RenderElement>
 				</inp2:m_DefineElement>
 
-				<inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/>
+				<inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30"/>
 
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingDate" title="!la_fld_ShippingDate!" size="16"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate" size="16"/>
 
 			</inp2:m_if>
 
Index: branches/5.1.x/admin_templates/payment_type/payment_type_gateway.tpl
===================================================================
diff -u -N -r13549 -r13946
--- branches/5.1.x/admin_templates/payment_type/payment_type_gateway.tpl	(.../payment_type_gateway.tpl)	(revision 13549)
+++ branches/5.1.x/admin_templates/payment_type/payment_type_gateway.tpl	(.../payment_type_gateway.tpl)	(revision 13946)
@@ -124,7 +124,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form" id="gateway_fields">
-		<inp2:m_RenderElement name="inp_edit_options" prefix="pt" field="GatewayId" title="!la_fld_Gateway!" onchange="refresh_fields()"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="pt" field="GatewayId" title="la_fld_Gateway" onchange="refresh_fields()"/>
 		<inp2:gwf_PrintList block="gateway_field" input_block_prefix="gw_input_" per_page="-1"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl	(.../orders_edit_billing.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl	(.../orders_edit_billing.tpl)	(revision 13946)
@@ -87,31 +87,31 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_OrderBilling!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_OrderBilling"/>
 			<inp2:m_if check="ord_OrderEditable">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="!la_fld_BillingTo!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="!la_fld_BillingCompany!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="!la_fld_BillingPhone!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingFax" title="!la_fld_BillingFax!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="!la_fld_BillingEmail!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress1" title="!la_fld_BillingAddress1!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress2" title="!la_fld_BillingAddress2!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="!la_fld_BillingCity!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="!la_fld_BillingState!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="!la_fld_BillingZip!" size="10"/>
-				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="!la_fld_BillingCountry!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentType" title="!la_fld_PaymentType!" onchange="submit_event('ord','OnPreSave');"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="la_fld_BillingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="la_fld_BillingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="la_fld_BillingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingFax" title="la_fld_BillingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="la_fld_BillingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress1" title="la_fld_BillingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress2" title="la_fld_BillingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="la_fld_BillingCity" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="la_fld_BillingState" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="la_fld_BillingZip" size="10"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="la_fld_BillingCountry" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentType" title="la_fld_PaymentType" onchange="submit_event('ord','OnPreSave');"/>
 
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="IsRecurringBilling" title="!la_fld_IsRecurringBilling!"/>
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="!la_fld_NextCharge!"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="IsRecurringBilling" title="la_fld_IsRecurringBilling"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="la_fld_NextCharge"/>
 
-				<!--<inp2:m_RenderElement name="inp_gwresults" prefix="ord" display_field="score" field="VerificationResult" title="!la_fld_VerificationResult!" />-->
+				<!--<inp2:m_RenderElement name="inp_gwresults" prefix="ord" display_field="score" field="VerificationResult" title="la_fld_VerificationResult" />-->
 
 				<inp2:m_if check="ord_UsingCreditCard">
-					<inp2:m_RenderElement name="subsection" title="!la_section_CreditCard!"/>
-					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="!la_fld_PaymentCardType!"/>
-					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="!la_fld_CreditCardNumber!" size="20"/>
-					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="!la_fld_PaymentNameOnCard!" size="20"/>
+					<inp2:m_RenderElement name="subsection" title="la_section_CreditCard"/>
+					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="la_fld_PaymentCardType"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="la_fld_CreditCardNumber" size="20"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="la_fld_PaymentNameOnCard" size="20"/>
 
 					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate">
 						<td class="control-cell">
@@ -121,89 +121,89 @@
 						</td>
 					</inp2:m_RenderElement>
 
-					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="!la_fld_PaymentCVV2!" size="5" maxlength="5"/>
-					<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentExpires!" size="16"/>
-					<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="ChargeOnNextApprove" title="!la_fld_ChargeOnNextApprove!"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="la_fld_PaymentCVV2" size="5" maxlength="5"/>
+					<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="la_fld_PaymentExpires" size="16"/>
+					<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="ChargeOnNextApprove" title="la_fld_ChargeOnNextApprove"/>
 				<inp2:m_else/>
-					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="!la_fld_PaymentAccount!" size="20"/>
-					<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentDate!" size="16"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="la_fld_PaymentAccount" size="20"/>
+					<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="la_fld_PaymentDate" size="16"/>
 				</inp2:m_if>
 
 				<inp2:m_if check="ord_Field" name="GWResult1" db="db">
-					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult1" title="!la_fld_AuthorizationResult!" />
+					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult1" title="la_fld_AuthorizationResult" />
 				</inp2:m_if>
 
 				<inp2:m_if check="ord_Field" name="GWResult2" db="db">
-					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult2" title="!la_fld_CaptureResult!" />
+					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult2" title="la_fld_CaptureResult" />
 				</inp2:m_if>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingTo" title="!la_fld_BillingTo!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCompany" title="!la_fld_BillingCompany!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingPhone" title="!la_fld_BillingPhone!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingFax" title="!la_fld_BillingFax!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingEmail" title="!la_fld_BillingEmail!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingAddress1" title="!la_fld_BillingAddress1!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingAddress2" title="!la_fld_BillingAddress2!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCity" title="!la_fld_BillingCity!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingState" title="!la_fld_BillingState!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingZip" title="!la_fld_BillingZip!" size="10"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCountry" title="!la_fld_BillingCountry!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentType" title="!la_fld_PaymentType!"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingTo" title="la_fld_BillingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCompany" title="la_fld_BillingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingPhone" title="la_fld_BillingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingFax" title="la_fld_BillingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingEmail" title="la_fld_BillingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingAddress1" title="la_fld_BillingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingAddress2" title="la_fld_BillingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCity" title="la_fld_BillingCity" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingState" title="la_fld_BillingState" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingZip" title="la_fld_BillingZip" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCountry" title="la_fld_BillingCountry" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentType" title="la_fld_PaymentType"/>
 
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="IsRecurringBilling" title="!la_fld_IsRecurringBilling!"/>
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="!la_fld_NextCharge!"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="IsRecurringBilling" title="la_fld_IsRecurringBilling"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="la_fld_NextCharge"/>
 
-				<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="VerificationResult" display_field="score" title="!la_fld_VerificationResult!" />
+				<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="VerificationResult" display_field="score" title="la_fld_VerificationResult" />
 
 				<inp2:m_if check="ord_UsingCreditCard">
-					<inp2:m_RenderElement name="subsection" title="!la_section_CreditCard!"/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCardType" title="!la_fld_PaymentCardType!"/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="!la_fld_CreditCardNumber!"/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentNameOnCard" title="!la_fld_PaymentNameOnCard!"/>
+					<inp2:m_RenderElement name="subsection" title="la_section_CreditCard"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCardType" title="la_fld_PaymentCardType"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="la_fld_CreditCardNumber"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentNameOnCard" title="la_fld_PaymentNameOnCard"/>
 
 					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate">
 						<td class="control-cell">
 							<inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/>
 						</td>
 					</inp2:m_RenderElement>
 
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCVV2" title="!la_fld_PaymentCVV2!"/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentExpires!"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCVV2" title="la_fld_PaymentCVV2"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="la_fld_PaymentExpires"/>
 				<inp2:m_else/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="!la_fld_PaymentAccount!"/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentDate!"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="la_fld_PaymentAccount"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="la_fld_PaymentDate"/>
 				</inp2:m_if>
 
 				<inp2:m_if check="ord_Field" name="GWResult1" db="db">
-					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult1" title="!la_fld_AuthorizationResult!" />
+					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult1" title="la_fld_AuthorizationResult" />
 				</inp2:m_if>
 
 				<inp2:m_if check="ord_Field" name="GWResult2" db="db">
-					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult2" title="!la_fld_CaptureResult!" />
+					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult2" title="la_fld_CaptureResult" />
 				</inp2:m_if>
 			</inp2:m_if>
 
 			<inp2:m_if check="ord_Field" name="CouponId">
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="CouponCode" title="!la_fld_CouponCode!" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="CouponCode" title="la_fld_CouponCode" />
 			</inp2:m_if>
-			<inp2:m_RenderElement name="inp_label" prefix="ord" field="DiscountTotal" title="!la_fld_TotalSavings!" />
-			<inp2:m_RenderElement name="inp_label" prefix="ord" field="ReturnTotal" title="!la_fld_TotalReturns!" />
+			<inp2:m_RenderElement name="inp_label" prefix="ord" field="DiscountTotal" title="la_fld_TotalSavings" />
+			<inp2:m_RenderElement name="inp_label" prefix="ord" field="ReturnTotal" title="la_fld_TotalReturns" />
 
 			<inp2:m_if check="ord_FieldEquals" name="VAT" value="0.00">
 			<inp2:m_else />
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="AmountWithoutVAT" title="!la_fld_SubTotal!" />
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="VAT" title="!la_fld_VAT!" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="AmountWithoutVAT" title="la_fld_SubTotal" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="VAT" title="la_fld_VAT" />
 			</inp2:m_if>
 
 			<inp2:m_if check="ord_Field" name="GiftCertificateId">
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateCode" title="!la_fld_Gift_Certificate_Number!" />
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateDiscount" title="!la_fld_Gift_Certificate_Amount_Applied!" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateCode" title="la_fld_Gift_Certificate_Number" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateDiscount" title="la_fld_Gift_Certificate_Amount_Applied" />
 			</inp2:m_if>
 
 
-			<inp2:m_RenderElement name="inp_label" prefix="ord" field="TotalAmount" title="!la_fld_TotalAmount!" />
+			<inp2:m_RenderElement name="inp_label" prefix="ord" field="TotalAmount" title="la_fld_TotalAmount" />
 			<inp2:m_if check="ord_HasOriginalAmount" >
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OriginalAmount" title="!la_fld_OriginalAmount!" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OriginalAmount" title="la_fld_OriginalAmount" />
 			</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl	(.../shipping_quote_engine_edit.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl	(.../shipping_quote_engine_edit.tpl)	(revision 13946)
@@ -73,11 +73,11 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_General!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="sqe" field="EngineId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="sqe" field="Name" title="!la_fld_ShippingQuoteEngineName!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="Status" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="AccountLogin" title="!la_fld_Login!" />
+		<inp2:m_RenderElement name="subsection" title="la_Text_General"/>
+			<inp2:m_RenderElement name="inp_label" prefix="sqe" field="EngineId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_label" prefix="sqe" field="Name" title="la_fld_ShippingQuoteEngineName"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="Status" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="AccountLogin" title="la_fld_Login" />
 
 			<inp2:m_RenderElement design="form_row" prefix="sqe" field="AccountPassword" title="la_fld_Password">
 				<td class="control-cell">
@@ -86,24 +86,24 @@
 			</inp2:m_RenderElement>
 
 	<inp2:m_if check="sqe_Field" field="ClassName" equals_to="Intershipper" db="db">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Carriers!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Carriers"/>
 			<inp2:m_RenderElement name="carrier" carrier="UPS" title="UPS" />
 			<inp2:m_RenderElement name="carrier" carrier="FDX" title="FedEx" />
 			<inp2:m_RenderElement name="carrier" carrier="DHL" title="DHL" />
 			<inp2:m_RenderElement name="carrier" carrier="USP" title="USPS" />
 			<inp2:m_RenderElement name="carrier" carrier="ARB" title="Airborne" />
 
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Delivery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="1DYEnabled" title="!la_fld_FirstDayDelivery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="2DYEnabled" title="!la_fld_SecondDayDelivery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="3DYEnabled" title="!la_fld_ThirdDayDelivery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="GNDEnabled" title="!la_fld_GroundDelivery!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Delivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="1DYEnabled" title="la_fld_FirstDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="2DYEnabled" title="la_fld_SecondDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="3DYEnabled" title="la_fld_ThirdDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="GNDEnabled" title="la_fld_GroundDelivery"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Other!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="sqe" field="ShipMethod" title="!la_fld_ShipMethod!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Other"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="sqe" field="ShipMethod" title="la_fld_ShipMethod"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="FlatSurcharge" title="!la_fld_FlatSurcharge!" size="10"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="PercentSurcharge" title="!la_fld_PercentSurcharge!" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="FlatSurcharge" title="la_fld_FlatSurcharge" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="PercentSurcharge" title="la_fld_PercentSurcharge" size="10"/>
 	</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/orders/orders_blocks.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/orders/orders_blocks.tpl	(.../orders_blocks.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/orders/orders_blocks.tpl	(.../orders_blocks.tpl)	(revision 13946)
@@ -279,11 +279,11 @@
 
 		<inp2:m_if check="ord_Field" field="GiftCertificateId">
 			<tr>
-				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="!la_fld_Gift_Certificate_Number!"/>:</td>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_Certificate_Number"/>:</td>
 				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateCode"/></td>
 			</tr>
 			<tr>
-				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="!la_fld_Gift_Certificate_Amount_Applied!"/>:</td>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_Certificate_Amount_Applied"/>:</td>
 				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateDiscount"/></td>
 			</tr>
 		</inp2:m_if>
Index: branches/5.1.x/admin_templates/orders/order_product_edit.tpl
===================================================================
diff -u -N -r13908 -r13946
--- branches/5.1.x/admin_templates/orders/order_product_edit.tpl	(.../order_product_edit.tpl)	(revision 13908)
+++ branches/5.1.x/admin_templates/orders/order_product_edit.tpl	(.../order_product_edit.tpl)	(revision 13946)
@@ -141,7 +141,7 @@
 
 		<div id="scroll_container">
 			<table class="edit-form">
-				<inp2:m_RenderElement name="subsection" title="!lu_comm_SelectOptions!"/>
+				<inp2:m_RenderElement name="subsection" title="lu_comm_SelectOptions"/>
 
 				<inp2:p_ListOptions no_table="1" per_page="-1" render_as="option_element" row_start_render_as="html:" row_end_render_as="html:"/>
 				<inp2:m_RenderElement name="inp_edit_filler"/>
Index: branches/5.1.x/admin_templates/payment_type/payment_type_edit.tpl
===================================================================
diff -u -N -r13549 -r13946
--- branches/5.1.x/admin_templates/payment_type/payment_type_edit.tpl	(.../payment_type_edit.tpl)	(revision 13549)
+++ branches/5.1.x/admin_templates/payment_type/payment_type_edit.tpl	(.../payment_type_edit.tpl)	(revision 13946)
@@ -55,15 +55,15 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="pt" field="PaymentTypeId" title="!la_fld_Id!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="Name" title="!la_fld_Name!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="Description" title="!la_fld_Description!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="pt" field="Instructions" title="!la_fld_Instructions!"  cols="40" rows="5"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="pt" field="AdminComments" title="!la_fld_AdminComments!" cols="40" rows="5"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pt" field="Status" title="!la_fld_Enabled!"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pt" field="PlacedOrdersEdit" title="!la_fld_PlacedOrdersEdit!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="Priority" title="!la_fld_Priority!" size="3"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="ProcessingFee" title="!la_fld_ProcessingFee!" size="4"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="pt" field="PaymentTypeId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="Name" title="la_fld_Name" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="Description" title="la_fld_Description" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="pt" field="Instructions" title="la_fld_Instructions"  cols="40" rows="5"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="pt" field="AdminComments" title="la_fld_AdminComments" cols="40" rows="5"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pt" field="Status" title="la_fld_Enabled"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pt" field="PlacedOrdersEdit" title="la_fld_PlacedOrdersEdit"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="Priority" title="la_fld_Priority" size="3"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="ProcessingFee" title="la_fld_ProcessingFee" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/products/shipping_options.tpl
===================================================================
diff -u -N -r13891 -r13946
--- branches/5.1.x/admin_templates/products/shipping_options.tpl	(.../shipping_options.tpl)	(revision 13891)
+++ branches/5.1.x/admin_templates/products/shipping_options.tpl	(.../shipping_options.tpl)	(revision 13946)
@@ -32,9 +32,9 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Properties!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Properties"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="p" field="ShippingLimitation"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="ShippingMode" title="!la_fld_ShippingMode!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="ShippingMode" title="la_fld_ShippingMode"/>
 
 			<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/admin_templates/orders/orders_edit.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/orders/orders_edit.tpl	(.../orders_edit.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/orders/orders_edit.tpl	(.../orders_edit.tpl)	(revision 13946)
@@ -60,9 +60,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_id_label" prefix="ord" field="OrderId" title="!la_fld_OrderId!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="ord" field="OrderId" title="la_fld_OrderId"/>
 
 			<inp2:m_if check="ord_OrderEditable">
 				<inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
@@ -74,53 +74,53 @@
 				</inp2:m_RenderElement>
 
 				<inp2:m_if check="m_IsDebugMode" >
-					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="Status" title="!la_fld_Status!"/>
+					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="Status" title="la_fld_Status"/>
 				<inp2:m_else/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="!la_fld_Status!"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="la_fld_Status"/>
 				</inp2:m_if>
 
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="OrderDate" title="!la_fld_Date!"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="OrderDate" title="la_fld_Date"/>
 
-				<inp2:m_RenderElement name="inp_edit_user" prefix="ord" field="PortalUserId" title="!la_fld_Username!" size="15"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="!la_fld_OrderIP!"/>
+				<inp2:m_RenderElement name="inp_edit_user" prefix="ord" field="PortalUserId" title="la_fld_Username" size="15"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="la_fld_OrderIP"/>
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="OnHold" title="la_fld_OnHold"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Affiliate!"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Affiliate"/>
 					<inp2:m_if check="ord_FieldEquals" field="AffiliateId" value="0">
-						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!" as_label="1"/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser" as_label="1"/>
 					<inp2:m_else/>
-						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!"/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser"/>
 					</inp2:m_if>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="!la_fld_AffiliateCommission!" currency="selected"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="la_fld_AffiliateCommission" currency="selected"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Comments!"/>
-					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="UserComment" title="!la_fld_UserComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
-					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="!la_fld_AdminComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Comments"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="UserComment" title="la_fld_UserComment" control_options="{min_height: 100}" rows="10" cols="40"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="la_fld_AdminComment" control_options="{min_height: 100}" rows="10" cols="40"/>
 			<inp2:m_else/>
 				<inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
 					<td class="control-cell">
 						<inp2:ord_Field field="OrderNumber"/>
 					</td>
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="!la_fld_Status!"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderDate" title="!la_fld_Date!"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="PortalUserId" title="!la_fld_Username!" size="15"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="la_fld_Status"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderDate" title="la_fld_Date"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="PortalUserId" title="la_fld_Username" size="15"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="!la_fld_OrderIP!"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="la_fld_OrderIP"/>
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="OnHold" title="la_fld_OnHold"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Affiliate!"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Affiliate"/>
 					<inp2:m_if check="ord_FieldEquals" field="AffiliateId" value="0">
-						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!" as_label="1"/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser" as_label="1"/>
 					<inp2:m_else/>
-						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!"/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser"/>
 					</inp2:m_if>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="!la_fld_AffiliateCommission!" currency="selected"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="la_fld_AffiliateCommission" currency="selected"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Comments!"/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="UserComment" title="!la_fld_UserComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
-					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="!la_fld_AdminComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Comments"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="UserComment" title="la_fld_UserComment" control_options="{min_height: 100}" rows="10" cols="40"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="la_fld_AdminComment" control_options="{min_height: 100}" rows="10" cols="40"/>
 			</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/currencies/currencies_edit.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/currencies/currencies_edit.tpl	(.../currencies_edit.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/currencies/currencies_edit.tpl	(.../currencies_edit.tpl)	(revision 13946)
@@ -55,9 +55,9 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Currency!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="curr" field="CurrencyId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="curr" field="ISO" title="!la_fld_ISOCode!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Currency"/>
+			<inp2:m_RenderElement name="inp_label" prefix="curr" field="CurrencyId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_label" prefix="curr" field="ISO" title="la_fld_ISOCode"/>
 
 			<inp2:m_RenderElement design="form_row" prefix="curr" field="RateToPrimary" title="la_fld_RateToPrimary">
 				<td class="control-cell">
@@ -75,12 +75,12 @@
 				</td>
 			</inp2:m_RenderElement>
 
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="curr" field="SymbolPosition" title="!la_fld_CurrencySymbolPosition!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="curr" field="SymbolPosition" title="la_fld_CurrencySymbolPosition"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="curr" field="Name" title="!la_fld_CurrencyName!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="curr" field="IsPrimary" title="!la_fld_Primary!" onchange="check_status()"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="curr" field="Status" title="!la_fld_Enabled!" onchange="check_primary()"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="curr" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="curr" field="Name" title="la_fld_CurrencyName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="curr" field="IsPrimary" title="la_fld_Primary" onchange="check_status()"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="curr" field="Status" title="la_fld_Enabled" onchange="check_primary()"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="curr" field="Priority" title="la_fld_Priority" size="5"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/products/relations_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/relations_edit.tpl	(.../relations_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/relations_edit.tpl	(.../relations_edit.tpl)	(revision 13946)
@@ -47,17 +47,17 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Relation!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Relation"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rel" field="SourceId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rel" field="SourceType"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rel" field="TargetId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rel" field="TargetType"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="rel" field="RelationshipId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_relation" prefix="rel" field="TargetId" title="!la_fld_TargetId!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="rel" field="Type" title="!la_fld_RelationshipType!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rel" field="Enabled" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="rel" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="rel" field="RelationshipId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_relation" prefix="rel" field="TargetId" title="la_fld_TargetId"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="rel" field="Type" title="la_fld_RelationshipType"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rel" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="rel" field="Priority" title="la_fld_Priority" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/products/file_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/file_edit.tpl	(.../file_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/file_edit.tpl	(.../file_edit.tpl)	(revision 13946)
@@ -29,15 +29,15 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_File!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_File"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="file" field="ProductId"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Name" title="!la_fld_Name!" size="50" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Version" title="!la_fld_Version!" size="10" />
-			<inp2:m_RenderElement name="inp_edit_upload" prefix="file" field="RealPath" title="!la_fld_FilePath!" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="file" field="Status" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="file" field="IsPrimary" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Priority" title="!la_fld_Priority!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_date" prefix="file" field="AddedOn" title="!la_fld_AddedOn!" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Name" title="la_fld_Name" size="50" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Version" title="la_fld_Version" size="10" />
+			<inp2:m_RenderElement name="inp_edit_upload" prefix="file" field="RealPath" title="la_fld_FilePath" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="file" field="Status" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="file" field="IsPrimary" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Priority" title="la_fld_Priority" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="file" field="AddedOn" title="la_fld_AddedOn" />
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/orders/orders_edit_preview.tpl
===================================================================
diff -u -N -r13912 -r13946
--- branches/5.1.x/admin_templates/orders/orders_edit_preview.tpl	(.../orders_edit_preview.tpl)	(revision 13912)
+++ branches/5.1.x/admin_templates/orders/orders_edit_preview.tpl	(.../orders_edit_preview.tpl)	(revision 13946)
@@ -72,7 +72,7 @@
 <inp2:ord_ErrorWarning name="form_error_warning"/>
 
 <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="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:m_phrase label="la_fld_OrderNumber"/>:
@@ -362,11 +362,11 @@
 
 		<inp2:m_if check="ord_Field" field="GiftCertificateId">
 			<tr>
-				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="!la_fld_Gift_Certificate_Number!"/>:</td>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_Certificate_Number"/>:</td>
 				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateCode"/></td>
 			</tr>
 			<tr>
-				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="!la_fld_Gift_Certificate_Amount_Applied!"/>:</td>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_Certificate_Amount_Applied"/>:</td>
 				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateDiscount"/></td>
 			</tr>
 		</inp2:m_if>
Index: branches/5.1.x/admin_templates/payment_type/payment_type_groups.tpl
===================================================================
diff -u -N -r13549 -r13946
--- branches/5.1.x/admin_templates/payment_type/payment_type_groups.tpl	(.../payment_type_groups.tpl)	(revision 13549)
+++ branches/5.1.x/admin_templates/payment_type/payment_type_groups.tpl	(.../payment_type_groups.tpl)	(revision 13946)
@@ -68,11 +68,11 @@
 <inp2:pt_SaveWarning name="grid_save_warning"/>
 <inp2:pt_ErrorWarning name="form_error_warning"/>
 
-<inp2:m_RenderElement name="inp_edit_hidden" prefix="pt" field="PortalGroups" title="!la_fld_UserGroups!" size="40"/>
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="pt" field="PortalGroups" title="la_fld_UserGroups" size="40"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_label" prefix="pt" field="PaymentTypeId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_label" prefix="pt" field="PaymentTypeId" title="la_fld_Id"/>
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="label-cell">
Index: branches/5.1.x/admin_templates/orders/export/export.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/orders/export/export.tpl	(.../export.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/orders/export/export.tpl	(.../export.tpl)	(revision 13946)
@@ -34,7 +34,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_edit_radio" prefix="ord.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
Index: branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl	(.../gift_certificate_edit.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl	(.../gift_certificate_edit.tpl)	(revision 13946)
@@ -82,33 +82,33 @@
 
 <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="gc" field="GiftCertificateId" title="la_fld_Id"/>
 
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Purchaser" title="!la_fld_SenderName!" size="35"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Recipient" title="!la_fld_RecipientName!" size="35"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Message" title="!la_fld_MessageText!" cols="35" rows="7"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Amount" title="!la_fld_Amount!" size="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Purchaser" title="la_fld_SenderName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Recipient" title="la_fld_RecipientName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Message" title="la_fld_MessageText" cols="35" rows="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Amount" title="la_fld_Amount" size="7"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="SendVia" title="!la_fld_DeliveryMethod!"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="SendVia" title="la_fld_DeliveryMethod"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Purchaser" title="!la_fld_SenderName!" size="35"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Recipient" title="!la_fld_RecipientName!" size="35"/>
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="gc" field="Message" title="!la_fld_MessageText!" cols="35" rows="7"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Amount" title="!la_fld_Amount!" size="7"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Purchaser" title="la_fld_SenderName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Recipient" title="la_fld_RecipientName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="gc" field="Message" title="la_fld_MessageText" cols="35" rows="7"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Amount" title="la_fld_Amount" size="7"/>
 
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="SendVia" title="!la_fld_DeliveryMethod!"/>
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="SendVia" title="la_fld_DeliveryMethod"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_EmailDelivery!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_EmailDelivery"/>
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientEmail" title="!la_fld_Email!" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientEmail" title="la_fld_Email" size="35"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientEmail" title="!la_fld_Email!" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientEmail" title="la_fld_Email" size="35"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_PostalDelivery!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_PostalDelivery"/>
 			<inp2:m_if check="gc_HasOrder">
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientFirstname" title="la_fld_FirstName" size="35"/>
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientLastname" title="la_fld_LastName" size="35"/>
@@ -132,11 +132,11 @@
 			</inp2:m_if>
 
 		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="Status" title="!la_fld_Status!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="Status" title="la_fld_Status"/>
 
 			<inp2:m_if check="gc_HasOrder">
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="la_fld_Code" size="35"/>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
 
@@ -149,13 +149,13 @@
 			</inp2:m_if>
 
 			<inp2:m_if check="gc_IsNewItem" inverse="inverse">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Debit" title="!la_fld_RemainingAmount!" size="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Debit" title="la_fld_RemainingAmount" size="7"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Expiration" title="!la_fld_Expiration!" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Expiration" title="la_fld_Expiration" size="10"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="Expiration" title="!la_fld_Expiration!" size="10"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="Expiration" title="la_fld_Expiration" size="10"/>
 			</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/products/images_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/images_edit.tpl	(.../images_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/images_edit.tpl	(.../images_edit.tpl)	(revision 13946)
@@ -47,22 +47,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="img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="img" field="ImageId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="img" field="ImageId" title="la_fld_Id"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="img" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="img" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="img" field="AltName" title="la_fld_AltValue" size="40"/>
 
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="img" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="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="img"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="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="img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
 			<inp2:m_RenderElement name="fullsize_section" prefix="img"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
Index: branches/5.1.x/admin_templates/products/products_files.tpl
===================================================================
diff -u -N -r13809 -r13946
--- branches/5.1.x/admin_templates/products/products_files.tpl	(.../products_files.tpl)	(revision 13809)
+++ branches/5.1.x/admin_templates/products/products_files.tpl	(.../products_files.tpl)	(revision 13946)
@@ -110,10 +110,10 @@
 
 <div id="scroll_container" mode="minimal">
 	<table class="edit-form" style="border-bottom: 1px solid black;">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Product!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="!la_fld_Price!" style="width: 100px;"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Product"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="la_fld_Price" style="width: 100px;"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
-		<inp2:m_RenderElement name="subsection" title="!la_section_Files!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Files"/>
 	</table>
 </div>
 
Index: branches/5.1.x/admin_templates/affiliate_plans/affiliates_payout.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/affiliate_plans/affiliates_payout.tpl	(.../affiliates_payout.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/affiliate_plans/affiliates_payout.tpl	(.../affiliates_payout.tpl)	(revision 13946)
@@ -29,9 +29,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_hidden" prefix="apayments" field="AffiliateId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="apayments" field="AffiliateId" title="!la_fld_Username!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="apayments" field="AffiliateId" title="la_fld_Username"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="apayments" field="Amount" title="la_fld_Amount"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="apayments" field="PaymentTypeId" title="la_fld_PaymentTypeId"/>
Index: branches/5.1.x/admin_templates/shipping/shipping_type_groups.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/shipping/shipping_type_groups.tpl	(.../shipping_type_groups.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/shipping/shipping_type_groups.tpl	(.../shipping_type_groups.tpl)	(revision 13946)
@@ -74,8 +74,8 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="s" field="ShippingID" title="!la_fld_Id!"/>
-		<inp2:m_RenderElement name="inp_edit_hidden" prefix="s" field="PortalGroups" title="!la_fld_UserGroups!" size="40"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="s" field="ShippingID" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_hidden" prefix="s" field="PortalGroups" title="la_fld_UserGroups" size="40"/>
 			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_inc param="tab_index" by="1"/>
 				<td class="label-cell">
Index: branches/5.1.x/admin_templates/products/pricing_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/products/pricing_edit.tpl	(.../pricing_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/pricing_edit.tpl	(.../pricing_edit.tpl)	(revision 13946)
@@ -29,16 +29,16 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_PriceBracket!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_PriceBracket"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="pr" field="ProductId"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="MinQty" title="!la_fld_MinQty!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="MaxQty" title="!la_fld_MaxQty!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Price" title="!la_fld_Price!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="MinQty" title="la_fld_MinQty" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="MaxQty" title="la_fld_MaxQty" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Price" title="la_fld_Price" size="4"/>
 		<!--## temporarily commented out
-			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Points" title="!la_fld_Points!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Points" title="la_fld_Points" size="4"/>
 		##-->
-			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Cost" title="!la_fld_Cost!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pr" field="Negotiated" title="!la_fld_Negotiated!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Cost" title="la_fld_Cost" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pr" field="Negotiated" title="la_fld_Negotiated" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/reports/reports.tpl
===================================================================
diff -u -N -r13912 -r13946
--- branches/5.1.x/admin_templates/reports/reports.tpl	(.../reports.tpl)	(revision 13912)
+++ branches/5.1.x/admin_templates/reports/reports.tpl	(.../reports.tpl)	(revision 13946)
@@ -28,12 +28,12 @@
 </table>
 
 <table width="100%" class="bordered">
-	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
 		<inp2:m_RenderElement name="inp_edit_radio" prefix="rep" field="ReportType" title="la_fld_ReportType" use_phrases="1"/>
 
-		<inp2:m_RenderElement name="inp_edit_date" prefix="rep" field="FromDateTime" title="!la_fld_FromDateTime!"/>
-		<inp2:m_RenderElement name="inp_edit_date" prefix="rep" field="ToDateTime" title="!la_fld_ToDateTime!"/>
+		<inp2:m_RenderElement name="inp_edit_date" prefix="rep" field="FromDateTime" title="la_fld_FromDateTime"/>
+		<inp2:m_RenderElement name="inp_edit_date" prefix="rep" field="ToDateTime" title="la_fld_ToDateTime"/>
 
 		<script type="text/javascript">
 			function updateTimeFrame(option) {
Index: branches/5.1.x/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl	(.../affiliate_payment_types_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl	(.../affiliate_payment_types_edit.tpl)	(revision 13946)
@@ -56,12 +56,12 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="apt" field="PaymentTypeId" title="!la_fld_Id!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="apt" field="Name" title="!la_fld_Name!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="apt" field="IsPrimary" title="!la_fld_IsPrimary!" onchange="check_status()"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="apt" field="Status" title="!la_fld_Enabled!"  onchange="check_primary()"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="apt" field="Priority" title="!la_fld_Priority!" size="5"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="apt" field="Description" title="!la_fld_Description!" cols="40" rows="5"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="apt" field="PaymentTypeId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="apt" field="Name" title="la_fld_Name" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="apt" field="IsPrimary" title="la_fld_IsPrimary" onchange="check_status()"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="apt" field="Status" title="la_fld_Enabled"  onchange="check_primary()"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="apt" field="Priority" title="la_fld_Priority" size="5"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="apt" field="Description" title="la_fld_Description" cols="40" rows="5"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/manufacturers/manufacturers_edit.tpl
===================================================================
diff -u -N -r13663 -r13946
--- branches/5.1.x/admin_templates/manufacturers/manufacturers_edit.tpl	(.../manufacturers_edit.tpl)	(revision 13663)
+++ branches/5.1.x/admin_templates/manufacturers/manufacturers_edit.tpl	(.../manufacturers_edit.tpl)	(revision 13946)
@@ -59,23 +59,23 @@
 <div id="scroll_container">
 	<table class="edit-form">
 			<inp2:m_RenderElement name="subsection" title="la_title_General"/>
-				<inp2:m_RenderElement name="inp_id_label" prefix="manuf" field="ManufacturerId" title="!la_fld_Id!"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Name" title="!la_fld_Name!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="manuf" field="Description" title="!la_fld_Description!" control_options="{min_height: 100}" cols="40" rows="5"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="URL" title="!la_fld_URL!" size="40"/>
+				<inp2:m_RenderElement name="inp_id_label" prefix="manuf" field="ManufacturerId" title="la_fld_Id"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Name" title="la_fld_Name" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="manuf" field="Description" title="la_fld_Description" control_options="{min_height: 100}" cols="40" rows="5"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="URL" title="la_fld_URL" size="40"/>
 				<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="manuf" field="Logo" thumbnail="120x120" title="la_fld_Logo"/>
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="manuf" field="IsPopular" title="la_fld_Popular"/>
 
 			<inp2:m_RenderElement name="subsection" title="la_title_ContactInformation"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Address1" title="!la_fld_Address1!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Address2" title="!la_fld_Address2!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="City" title="!la_fld_City!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="State" title="!la_fld_State!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_options" has_empty="1" prefix="manuf" field="Country" title="!la_fld_Country!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Zip" title="!la_fld_Zip!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Phone" title="!la_fld_Phone!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Fax" title="!la_fld_Fax!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Email" title="!la_fld_Email!" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Address1" title="la_fld_Address1" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Address2" title="la_fld_Address2" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="City" title="la_fld_City" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="State" title="la_fld_State" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_options" has_empty="1" prefix="manuf" field="Country" title="la_fld_Country" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Zip" title="la_fld_Zip" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Phone" title="la_fld_Phone" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Fax" title="la_fld_Fax" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Email" title="la_fld_Email" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/shipping/shipping_costs.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/shipping/shipping_costs.tpl	(.../shipping_costs.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/shipping/shipping_costs.tpl	(.../shipping_costs.tpl)	(revision 13946)
@@ -149,9 +149,9 @@
 
 <div id="scroll_container" mode="minimal">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="s" field="CostType" title="!la_fld_CostType!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="ZeroIfEmpty" title="!la_fld_EmptyCellsAre!" size="20"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="s" field="CostType" title="la_fld_CostType"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="ZeroIfEmpty" title="la_fld_EmptyCellsAre" size="20"/>
 
 			<inp2:m_RenderElement design="form_row" prefix="s" field="PrecisionBeforeSep" title="la_Precision">
 				<td class="control-cell">
@@ -176,7 +176,7 @@
 </div>
 
 <table class="edit-form">
-	<inp2:m_RenderElement name="subsection" title="!la_section_ShippingCosts!"/>
+	<inp2:m_RenderElement name="subsection" title="la_section_ShippingCosts"/>
 </table>
 
 <div id="cost_container" style="overflow: auto;">
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 -->
Index: branches/5.1.x/admin_templates/shipping/shipping_edit.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/shipping/shipping_edit.tpl	(.../shipping_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/shipping/shipping_edit.tpl	(.../shipping_edit.tpl)	(revision 13946)
@@ -58,21 +58,21 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Shipping_Type!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="s" field="ShippingID" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="Code" title="!la_fld_ShippingCode!" size="20"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="Name" title="!la_fld_ShippingName!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="SpeedCode" title="!la_fld_SpeedCode!" size="20"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="Type" title="!la_fld_ShippingType!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="BaseFee" title="!la_fld_BaseFee!"/>
-			<inp2:m_RenderElement name="inp_edit_options" use_phrases="1" prefix="s" field="InsuranceType" title="!la_fld_Insurance_Type!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="InsuranceFee" title="!la_fld_Insurance_Fee!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="FreeShippingMinAmount" title="!la_fld_FreeShippingMinAmount!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="s" field="IsFreePromoShipping" title="!la_fld_IsFreePromoShipping!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Shipping_Type"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="s" field="ShippingID" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="Code" title="la_fld_ShippingCode" size="20"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="Name" title="la_fld_ShippingName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="SpeedCode" title="la_fld_SpeedCode" size="20"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="Type" title="la_fld_ShippingType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="BaseFee" title="la_fld_BaseFee"/>
+			<inp2:m_RenderElement name="inp_edit_options" use_phrases="1" prefix="s" field="InsuranceType" title="la_fld_Insurance_Type"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="InsuranceFee" title="la_fld_Insurance_Fee" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="FreeShippingMinAmount" title="la_fld_FreeShippingMinAmount"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="s" field="IsFreePromoShipping" title="la_fld_IsFreePromoShipping"/>
 
-			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="s" field="CODFlatSurcharge" title="!la_fld_CODFlatSurcharge!" size="10" /> -->
-			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="s" field="CODPercentSurcharge" title="!la_fld_CODPercentSurcharge!" size="10" /> -->
+			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="s" field="CODFlatSurcharge" title="la_fld_CODFlatSurcharge" size="10" /> -->
+			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="s" field="CODPercentSurcharge" title="la_fld_CODPercentSurcharge" size="10" /> -->
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/shipping/shipping_brackets.tpl
===================================================================
diff -u -N -r13100 -r13946
--- branches/5.1.x/admin_templates/shipping/shipping_brackets.tpl	(.../shipping_brackets.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/shipping/shipping_brackets.tpl	(.../shipping_brackets.tpl)	(revision 13946)
@@ -254,8 +254,8 @@
 <div id="scroll_container">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 		<tr nowrap="nowrap" class="grid-header-row-0">
-			<inp2:m_RenderElement name="br_grid_th" phrase="!la_col_Start!"/>
-			<inp2:m_RenderElement name="br_grid_th" phrase="!la_col_End!"/>
+			<inp2:m_RenderElement name="br_grid_th" phrase="la_col_Start"/>
+			<inp2:m_RenderElement name="br_grid_th" phrase="la_col_End"/>
 		</tr>
 		<inp2:br_ShowBracketsForm block="bracket" IdField="BracketId"/>
 	</table>
Index: branches/5.1.x/admin_templates/shipping/zone_edit.tpl
===================================================================
diff -u -N -r13465 -r13946
--- branches/5.1.x/admin_templates/shipping/zone_edit.tpl	(.../zone_edit.tpl)	(revision 13465)
+++ branches/5.1.x/admin_templates/shipping/zone_edit.tpl	(.../zone_edit.tpl)	(revision 13946)
@@ -165,14 +165,14 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_ShippingZone!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="z" field="ZoneID" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_ShippingZone"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="z" field="ZoneID" title="la_fld_Id"/>
 
-			<inp2:m_RenderElement name="inp_label" prefix="z" field="ShippingTypeID" title="!la_fld_ShippingTypeId!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="z" field="ShippingTypeID" title="la_fld_ShippingTypeId"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="z" field="Name" title="!la_fld_ShipZoneName!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="z" field="CODallowed" title="!la_fld_CODallowed!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="z" field="Type" title="!la_fld_Zone_Type!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="z" field="Name" title="la_fld_ShipZoneName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="z" field="CODallowed" title="la_fld_CODallowed"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="z" field="Type" title="la_fld_Zone_Type"/>
 
 			<inp2:m_if check="z_Field" field="Type" equals_to="1" db="db">
 				<inp2:m_RenderElement name="countries_multiple" prefix="z" />