Index: custom/admin_templates/widgets/widget_edit.tpl
===================================================================
--- custom/admin_templates/widgets/widget_edit.tpl	(revision 13916)
+++ custom/admin_templates/widgets/widget_edit.tpl	(working copy)
@@ -63,26 +63,26 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Page!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="widget" field="WidgetId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Title" title="!la_fld_Title!" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="widget" field="Good" title="!la_fld_Good!"/>
-			<inp2:m_RenderElement name="inp_edit_fck" prefix="widget" field="Description" title="!la_fld_Description!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="widget" field="WidgetId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Title" title="la_fld_Title" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="widget" field="Good" title="la_fld_Good"/>
+			<inp2:m_RenderElement name="inp_edit_fck" prefix="widget" field="Description" title="la_fld_Description"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="widget" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="widget" field="Type" title="la_fld_Type" has_empty="1"/>
 
 		<!--##
 			<inp2:m_RenderElement name="inp_edit_date" prefix="widget" field="CreatedOn" title="la_fld_CreatedOn"/>
 			<inp2:m_RenderElement name="inp_edit_time" prefix="widget" field="BirthTime" title="la_fld_BirthTime"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="widget" field="IsSystem" title="!la_fld_IsSystemTemplate!" onchange="OnSystemClick()"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="widget" field="IsSystem" title="la_fld_IsSystemTemplate" onchange="OnSystemClick()"/>
 		##-->
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Qty" title="!la_fld_Qty!" style="width: 50px"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="widget" field="Phone" title="!la_fld_Phone!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Email" title="!la_fld_Email!" style="width: 200px"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Qty" title="la_fld_Qty" style="width: 50px"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="widget" field="Phone" title="la_fld_Phone"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Email" title="la_fld_Email" style="width: 200px"/>
 
-			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="widget" field="Image" title="!la_fld_Image!"/>
-			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="widget" field="DataFile" title="!la_fld_DataFile!"/>
+			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="widget" field="Image" title="la_fld_Image"/>
+			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="widget" field="DataFile" title="la_fld_DataFile"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-auction/admin_templates/categories/categories_edit_ebay.tpl
===================================================================
--- in-auction/admin_templates/categories/categories_edit_ebay.tpl	(revision 13916)
+++ in-auction/admin_templates/categories/categories_edit_ebay.tpl	(working copy)
@@ -87,53 +87,53 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c-ebay" field="SubTitle" title="!la_fld_SubTitle!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="DetailTemplateId" title="!la_fld_DetailTemplate!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="AuctionListingDuration" title="!la_fld_AuctionListingDuration!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="StoreListingDuration" title="!la_fld_StoreListingDuration!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="AutoRelist" title="!la_fld_AutoRelist!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="ShippingAsParent" title="!la_fld_ShippingAsParent!" not_null="1" onclick="ParentCheckboxStatusShipping('c-s-ebay',this.id)" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="HitCounter" title="!la_fld_HitCounter!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c-ebay" field="SubTitle" title="la_fld_SubTitle" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="DetailTemplateId" title="la_fld_DetailTemplate"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="AuctionListingDuration" title="la_fld_AuctionListingDuration"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="StoreListingDuration" title="la_fld_StoreListingDuration"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="AutoRelist" title="la_fld_AutoRelist"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="ShippingAsParent" title="la_fld_ShippingAsParent" not_null="1" onclick="ParentCheckboxStatusShipping('c-s-ebay',this.id)" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="HitCounter" title="la_fld_HitCounter"/>
 
 			<inp2:m_if check="c-ebay_IsProductsCategory">
-				<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" not_null="1" field="ScheduleId" title="!la_fld_Schedule!"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" not_null="1" field="ScheduleId" title="la_fld_Schedule"/>
 			</inp2:m_if>
 			<inp2:m_if check="c-ebay_IsSubProductsCategory">
-				<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="ScheduleId" title="!la_fld_Schedule!"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="ScheduleId" title="la_fld_Schedule"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Categories!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Categories"/>
 
 
-			<inp2:m_RenderElement name="inp_edit_category2" prefix="c-ebay" field="AuctionPrimaryCategoryId" title="!la_fld_AuctionPrimaryCategoryId!" not_null="1" specifics="primary" other_field="AuctionSecondaryCategoryId"  />
-			<inp2:m_RenderElement name="inp_edit_category2" prefix="c-ebay" field="AuctionSecondaryCategoryId" title="!la_fld_AuctionSecondaryCategoryId!"  not_null="1"  specifics="secondary" other_field="AuctionPrimaryCategoryId"  />
+			<inp2:m_RenderElement name="inp_edit_category2" prefix="c-ebay" field="AuctionPrimaryCategoryId" title="la_fld_AuctionPrimaryCategoryId" not_null="1" specifics="primary" other_field="AuctionSecondaryCategoryId"  />
+			<inp2:m_RenderElement name="inp_edit_category2" prefix="c-ebay" field="AuctionSecondaryCategoryId" title="la_fld_AuctionSecondaryCategoryId"  not_null="1"  specifics="secondary" other_field="AuctionPrimaryCategoryId"  />
 
-			<inp2:m_RenderElement name="inp_edit_category2" prefix="c-ebay" field="StorePrimaryCategoryId" is_store="1" title="!la_fld_StorePrimaryCategoryId!"  not_null="1"   specifics="none" />
-			<inp2:m_RenderElement name="inp_edit_category2" prefix="c-ebay" field="StoreSecondaryCategoryId" is_store="1" title="!la_fld_StoreSecondaryCategoryId!"  not_null="1"   specifics="none" />
+			<inp2:m_RenderElement name="inp_edit_category2" prefix="c-ebay" field="StorePrimaryCategoryId" is_store="1" title="la_fld_StorePrimaryCategoryId"  not_null="1"   specifics="none" />
+			<inp2:m_RenderElement name="inp_edit_category2" prefix="c-ebay" field="StoreSecondaryCategoryId" is_store="1" title="la_fld_StoreSecondaryCategoryId"  not_null="1"   specifics="none" />
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Pricing!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="GetItFast" title="!la_fld_GetItFast!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Pricing"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="GetItFast" title="la_fld_GetItFast"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Images!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="UseGallery" title="!la_fld_UseGallery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="UseGalleryPlus" title="!la_fld_UseGalleryPlus!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Images"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="UseGallery" title="la_fld_UseGallery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="UseGalleryPlus" title="la_fld_UseGalleryPlus"/>
 
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_PaymentReturnPolicy!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c-ebay" field="PayPalSellerEmail" title="!la_fld_PayPalSellerEmail!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_multioptions" prefix="c-ebay" field="PaymentMethod" title="!la_fld_PaymentMethod!" />
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c-ebay" field="PaymentInstructions" title="!la_fld_PaymentInstructions!" cols="40" rows="5"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="HasReturnPolicy" title="!la_fld_HasReturnPolicy!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="RefundType" title="!la_fld_RefundType!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="ReturnRequestDays" title="!la_fld_ReturnRequestDays!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c-ebay" field="ReturnPolicyDetails" title="!la_fld_ReturnPolicyDetails!" cols="40" rows="5"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_PaymentReturnPolicy"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c-ebay" field="PayPalSellerEmail" title="la_fld_PayPalSellerEmail" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_multioptions" prefix="c-ebay" field="PaymentMethod" title="la_fld_PaymentMethod" />
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c-ebay" field="PaymentInstructions" title="la_fld_PaymentInstructions" cols="40" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-ebay" field="HasReturnPolicy" title="la_fld_HasReturnPolicy"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="RefundType" title="la_fld_RefundType"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="ReturnRequestDays" title="la_fld_ReturnRequestDays"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c-ebay" field="ReturnPolicyDetails" title="la_fld_ReturnPolicyDetails" cols="40" rows="5"/>
 
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Insurance!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="InsuranceType" use_phrases="1" title="!la_fld_InsuranceType!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="c-ebay" field="InsuranceAmount" title="!la_fld_InsuranceAmount!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="UseInsurance" title="!la_fld_UseInsurance!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Insurance"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="InsuranceType" use_phrases="1" title="la_fld_InsuranceType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c-ebay" field="InsuranceAmount" title="la_fld_InsuranceAmount" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c-ebay" field="UseInsurance" title="la_fld_UseInsurance"/>
 
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 			<td class="control-cell" colspan="4">
Index: in-auction/admin_templates/detail_template/detail_template_edit.tpl
===================================================================
--- in-auction/admin_templates/detail_template/detail_template_edit.tpl	(revision 13916)
+++ in-auction/admin_templates/detail_template/detail_template_edit.tpl	(working copy)
@@ -58,9 +58,9 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="dt" field="DetailTemplateId" title="!la_fld_Id!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="dt" field="TemplateName" title="!la_fld_Name!" size="80"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="dt" field="TemplateBody" title="!la_fld_TemplateBody!" cols="80" rows="50"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="dt" field="DetailTemplateId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="dt" field="TemplateName" title="la_fld_Name" size="80"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="dt" field="TemplateBody" title="la_fld_TemplateBody" cols="80" rows="50"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-auction/admin_templates/error_log/error_log_view.tpl
===================================================================
--- in-auction/admin_templates/error_log/error_log_view.tpl	(revision 13916)
+++ in-auction/admin_templates/error_log/error_log_view.tpl	(working copy)
@@ -80,19 +80,19 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="LogId" title="!la_fld_Id!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="RequestType" title="!la_fld_RequestType!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="RequestTime" title="!la_fld_RequestTime!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="DurationSeconds" title="!la_fld_DurationSeconds!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="AnswerStatus" title="!la_fld_AnswerStatus!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="ListingId" title="!la_fld_Listing_Id!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="Errors" nl2br="1" title="!la_fld_Errors!"/>
-		<inp2:m_RenderElement name="inp_array_label" prefix="err-ebay" field="Request" title="!la_fld_Request!"/>
+		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="LogId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="RequestType" title="la_fld_RequestType"/>
+		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="RequestTime" title="la_fld_RequestTime"/>
+		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="DurationSeconds" title="la_fld_DurationSeconds"/>
+		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="AnswerStatus" title="la_fld_AnswerStatus"/>
+		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="ListingId" title="la_fld_Listing_Id"/>
+		<inp2:m_RenderElement name="inp_label" prefix="err-ebay" field="Errors" nl2br="1" title="la_fld_Errors"/>
+		<inp2:m_RenderElement name="inp_array_label" prefix="err-ebay" field="Request" title="la_fld_Request"/>
 		<inp2:m_if check="m_IsDebugMode">
 			<inp2:m_if check="err-ebay_Field" field="AnswerFile">
-				<inp2:m_RenderElement name="inp_file_label" prefix="err-ebay" field="AnswerFile" title="!la_fld_Answer!"/>
+				<inp2:m_RenderElement name="inp_file_label" prefix="err-ebay" field="AnswerFile" title="la_fld_Answer"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_array_label" prefix="err-ebay" field="Answer" title="!la_fld_Answer!"/>
+				<inp2:m_RenderElement name="inp_array_label" prefix="err-ebay" field="Answer" title="la_fld_Answer"/>
 			</inp2:m_if>
 		</inp2:m_if>
 
Index: in-auction/admin_templates/listings/listings_view.tpl
===================================================================
--- in-auction/admin_templates/listings/listings_view.tpl	(revision 13916)
+++ in-auction/admin_templates/listings/listings_view.tpl	(working copy)
@@ -54,43 +54,43 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ListingId" title="!la_fld_Listing_Id!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ProductId" title="!la_fld_ProductId!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ListingType" title="!la_fld_ListingType!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="Status" title="!la_fld_Status!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="eBayListingId" title="!la_fld_eBayListingId!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="BidCounter" title="!la_fld_BidCounter!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="CurrentPrice" title="!la_fld_CurrentPrice!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="DetailTemplateBody" title="!la_fld_DetailTemplateBody!" nl2br="1"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ImageUrls" title="!la_fld_ImageUrls!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="UseGallery" title="!la_fld_UseGallery!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="UseGalleryPlus" title="!la_fld_UseGalleryPlus!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="CreatedOn" title="!la_fld_CreatedOn!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="PaymentMethod" title="!la_fld_PaymentMethod!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="PayPalSellerEmail" title="!la_fld_PayPalSellerEmail!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AutoRelist" title="!la_fld_AutoRelist!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="PaymentInstructions" title="!la_fld_PaymentInstructions!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="OriginalListingId" title="!la_fld_OriginalListingId!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="Modified" title="!la_fld_Modified!"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ListingId" title="la_fld_Listing_Id"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ProductId" title="la_fld_ProductId"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ListingType" title="la_fld_ListingType"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="Status" title="la_fld_Status"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="eBayListingId" title="la_fld_eBayListingId"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="BidCounter" title="la_fld_BidCounter"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="CurrentPrice" title="la_fld_CurrentPrice"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="DetailTemplateBody" title="la_fld_DetailTemplateBody" nl2br="1"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ImageUrls" title="la_fld_ImageUrls"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="UseGallery" title="la_fld_UseGallery"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="UseGalleryPlus" title="la_fld_UseGalleryPlus"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="CreatedOn" title="la_fld_CreatedOn"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="PaymentMethod" title="la_fld_PaymentMethod"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="PayPalSellerEmail" title="la_fld_PayPalSellerEmail"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AutoRelist" title="la_fld_AutoRelist"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="PaymentInstructions" title="la_fld_PaymentInstructions"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="OriginalListingId" title="la_fld_OriginalListingId"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="Modified" title="la_fld_Modified"/>
 		<inp2:m_if check="l-ebay_FieldEquals" field="ListingType" value="1">
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionStartPrice" title="!la_fld_AuctionStartPrice!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionReservePrice" title="!la_fld_AuctionReservePrice!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionBuyItNowPrice" title="!la_fld_AuctionBuyItNowPrice!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionListingDuration" title="!la_fld_AuctionListingDuration!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementBoldTitle" title="!la_fld_EnhancementBoldTitle!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementBorder" title="!la_fld_EnhancementBorder!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementFeatured" title="!la_fld_EnhancementFeatured!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementHighlight" title="!la_fld_EnhancementHighlight!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementHomePageFeatured" title="!la_fld_EnhancementHomePageFeatured!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="Fixed" title="!la_fld_Fixed!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionListingDuration" title="!la_fld_AuctionListingDuration!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionListingDuration" title="!la_fld_AuctionListingDuration!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionStartPrice" title="la_fld_AuctionStartPrice"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionReservePrice" title="la_fld_AuctionReservePrice"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionBuyItNowPrice" title="la_fld_AuctionBuyItNowPrice"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionListingDuration" title="la_fld_AuctionListingDuration"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementBoldTitle" title="la_fld_EnhancementBoldTitle"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementBorder" title="la_fld_EnhancementBorder"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementFeatured" title="la_fld_EnhancementFeatured"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementHighlight" title="la_fld_EnhancementHighlight"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="EnhancementHomePageFeatured" title="la_fld_EnhancementHomePageFeatured"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="Fixed" title="la_fld_Fixed"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionListingDuration" title="la_fld_AuctionListingDuration"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="AuctionListingDuration" title="la_fld_AuctionListingDuration"/>
 		<inp2:m_else/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="StoreBuyItNowPrice" title="!la_fld_StoreBuyItNowPrice!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="StoreListingDuration" title="!la_fld_StoreListingDuration!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="StoreBuyItNowPrice" title="la_fld_StoreBuyItNowPrice"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="StoreListingDuration" title="la_fld_StoreListingDuration"/>
 		</inp2:m_if>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ListingQuantity" title="!la_fld_ListingQuantity!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="LogId" title="!la_fld_LogId!"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="ListingQuantity" title="la_fld_ListingQuantity"/>
+		<inp2:m_RenderElement name="inp_label" prefix="l-ebay" field="LogId" title="la_fld_LogId"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-auction/admin_templates/products/products_ebay.tpl
===================================================================
--- in-auction/admin_templates/products/products_ebay.tpl	(revision 13916)
+++ in-auction/admin_templates/products/products_ebay.tpl	(working copy)
@@ -139,56 +139,56 @@
 
 <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_box" prefix="p-ebay" field="ListingTitle" title="!la_fld_ListingTitle!" size="70" not_null="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="SubTitle" title="!la_fld_SubTitle!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p-ebay" field="ListingDescription" title="!la_fld_ListingDescription!" cols="70" rows="10" not_null="1"/>
-			<inp2:m_RenderElement name="inp_template_options" prefix="p-ebay" field="DetailTemplateId" title="!la_fld_DetailTemplate!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="AuctionListingDuration" title="!la_fld_AuctionListingDuration!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="StoreListingDuration" title="!la_fld_StoreListingDuration!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="AutoRelist" title="!la_fld_AutoRelist!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="ShippingAsParent" title="!la_fld_ShippingAsParent!" not_null="1" onclick="ParentCheckboxStatusShipping('s-ebay',this.id)" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="HitCounter" title="!la_fld_HitCounter!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="BlockScheduling" not_null="1" title="!la_fld_BlockFromScheduling!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="ListingTitle" title="la_fld_ListingTitle" size="70" not_null="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="SubTitle" title="la_fld_SubTitle" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p-ebay" field="ListingDescription" title="la_fld_ListingDescription" cols="70" rows="10" not_null="1"/>
+			<inp2:m_RenderElement name="inp_template_options" prefix="p-ebay" field="DetailTemplateId" title="la_fld_DetailTemplate"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="AuctionListingDuration" title="la_fld_AuctionListingDuration"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="StoreListingDuration" title="la_fld_StoreListingDuration"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="AutoRelist" title="la_fld_AutoRelist"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="ShippingAsParent" title="la_fld_ShippingAsParent" not_null="1" onclick="ParentCheckboxStatusShipping('s-ebay',this.id)" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="HitCounter" title="la_fld_HitCounter"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="BlockScheduling" not_null="1" title="la_fld_BlockFromScheduling"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Categories!"/>
-			<inp2:m_RenderElement name="inp_edit_category2" prefix="p-ebay" field="AuctionPrimaryCategoryId" title="!la_fld_AuctionPrimaryCategoryId!" specifics="primary" other_field="AuctionSecondaryCategoryId" />
-			<inp2:m_RenderElement name="inp_edit_category2" prefix="p-ebay" field="AuctionSecondaryCategoryId" title="!la_fld_AuctionSecondaryCategoryId!"  other_field="AuctionPrimaryCategoryId" specifics="secondary"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Categories"/>
+			<inp2:m_RenderElement name="inp_edit_category2" prefix="p-ebay" field="AuctionPrimaryCategoryId" title="la_fld_AuctionPrimaryCategoryId" specifics="primary" other_field="AuctionSecondaryCategoryId" />
+			<inp2:m_RenderElement name="inp_edit_category2" prefix="p-ebay" field="AuctionSecondaryCategoryId" title="la_fld_AuctionSecondaryCategoryId"  other_field="AuctionPrimaryCategoryId" specifics="secondary"/>
 
 
-			<inp2:m_RenderElement name="inp_edit_category2" prefix="p-ebay" field="StorePrimaryCategoryId" is_store="1" title="!la_fld_StorePrimaryCategoryId!" specifics="none"/>
-			<inp2:m_RenderElement name="inp_edit_category2" prefix="p-ebay" field="StoreSecondaryCategoryId" is_store="1" title="!la_fld_StoreSecondaryCategoryId!"  specifics="none" />
+			<inp2:m_RenderElement name="inp_edit_category2" prefix="p-ebay" field="StorePrimaryCategoryId" is_store="1" title="la_fld_StorePrimaryCategoryId" specifics="none"/>
+			<inp2:m_RenderElement name="inp_edit_category2" prefix="p-ebay" field="StoreSecondaryCategoryId" is_store="1" title="la_fld_StoreSecondaryCategoryId"  specifics="none" />
 
 
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Pricing!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="AuctionStartPrice" title="!la_fld_AuctionStartPrice!" size="10" not_null="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="AuctionBuyItNowPrice" title="!la_fld_AuctionBuyItNowPrice!" size="10" not_null="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="AuctionReservePrice" title="!la_fld_AuctionReservePrice!" size="10" not_null="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="StoreBuyItNowPrice" title="!la_fld_StoreBuyItNowPrice!" size="10" not_null="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="GetItFast" title="!la_fld_GetItFast!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Pricing"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="AuctionStartPrice" title="la_fld_AuctionStartPrice" size="10" not_null="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="AuctionBuyItNowPrice" title="la_fld_AuctionBuyItNowPrice" size="10" not_null="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="AuctionReservePrice" title="la_fld_AuctionReservePrice" size="10" not_null="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="StoreBuyItNowPrice" title="la_fld_StoreBuyItNowPrice" size="10" not_null="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="GetItFast" title="la_fld_GetItFast"/>
 
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Images!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="UseGallery" title="!la_fld_UseGallery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="UseGalleryPlus" title="!la_fld_UseGalleryPlus!"/>
-			<inp2:m_RenderElement name="inp_edit_images" prefix="p-ebay" field="Images" title="!la_fld_Images!" not_null="1"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Images"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="UseGallery" title="la_fld_UseGallery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="UseGalleryPlus" title="la_fld_UseGalleryPlus"/>
+			<inp2:m_RenderElement name="inp_edit_images" prefix="p-ebay" field="Images" title="la_fld_Images" not_null="1"/>
 
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_PaymentReturnPolicy!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="PayPalSellerEmail" title="!la_fld_PayPalSellerEmail!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_multioptions" prefix="p-ebay" field="PaymentMethod" title="!la_fld_PaymentMethod!" />
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p-ebay" field="PaymentInstructions" title="!la_fld_PaymentInstructions!" cols="40" rows="5"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="HasReturnPolicy" title="!la_fld_HasReturnPolicy!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="RefundType" title="!la_fld_RefundType!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="ReturnRequestDays" title="!la_fld_ReturnRequestDays!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p-ebay" field="ReturnPolicyDetails" title="!la_fld_ReturnPolicyDetails!" cols="40" rows="5"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_PaymentReturnPolicy"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="PayPalSellerEmail" title="la_fld_PayPalSellerEmail" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_multioptions" prefix="p-ebay" field="PaymentMethod" title="la_fld_PaymentMethod" />
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p-ebay" field="PaymentInstructions" title="la_fld_PaymentInstructions" cols="40" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p-ebay" field="HasReturnPolicy" title="la_fld_HasReturnPolicy"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="RefundType" title="la_fld_RefundType"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="ReturnRequestDays" title="la_fld_ReturnRequestDays"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p-ebay" field="ReturnPolicyDetails" title="la_fld_ReturnPolicyDetails" cols="40" rows="5"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Insurance!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="InsuranceType" use_phrases="1" title="!la_fld_InsuranceType!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="InsuranceAmount" title="!la_fld_InsuranceAmount!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="UseInsurance" title="!la_fld_UseInsurance!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Insurance"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="InsuranceType" use_phrases="1" title="la_fld_InsuranceType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p-ebay" field="InsuranceAmount" title="la_fld_InsuranceAmount" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p-ebay" field="UseInsurance" title="la_fld_UseInsurance"/>
 
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 			<td class="control-cell" colspan="4">
Index: in-auction/admin_templates/schedule/schedule_edit.tpl
===================================================================
--- in-auction/admin_templates/schedule/schedule_edit.tpl	(revision 13916)
+++ in-auction/admin_templates/schedule/schedule_edit.tpl	(working copy)
@@ -58,18 +58,18 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="ebayschedule" field="ScheduleId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="ebayschedule" field="ScheduleId" title="la_fld_Id"/>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="ebayschedule" field="ScheduleName" title="!la_fld_Name!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="ebayschedule" field="ListingQuantity" title="!la_fld_ListingQuantity!" size="4"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="ebayschedule" field="Status" title="!la_fld_Status!"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="ebayschedule" field="ListingType" title="!la_fld_ListingType!"/>
-		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="ebayschedule" field="WeekDays" title="!la_fld_WeekDays!" use_phrases="1"/>
-		<inp2:m_RenderElement name="inp_edit_date" prefix="ebayschedule" field="StartDate" title="!la_fld_StartDate!"/>
-		<inp2:m_RenderElement name="inp_edit_time" prefix="ebayschedule" field="StartTime" title="!la_fld_StartTime!"/>
-		<inp2:m_RenderElement name="inp_edit_time" prefix="ebayschedule" field="EndTime" title="!la_fld_EndTime!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="ebayschedule" field="ContinueUntilQty" title="!la_fld_ContinueUntilQuantity!" size="4"/>
-		<inp2:m_RenderElement name="inp_label" prefix="ebayschedule" field="LastProcessed" title="!la_fld_LastProcessed!"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="ebayschedule" field="ScheduleName" title="la_fld_Name" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="ebayschedule" field="ListingQuantity" title="la_fld_ListingQuantity" size="4"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="ebayschedule" field="Status" title="la_fld_Status"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="ebayschedule" field="ListingType" title="la_fld_ListingType"/>
+		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="ebayschedule" field="WeekDays" title="la_fld_WeekDays" use_phrases="1"/>
+		<inp2:m_RenderElement name="inp_edit_date" prefix="ebayschedule" field="StartDate" title="la_fld_StartDate"/>
+		<inp2:m_RenderElement name="inp_edit_time" prefix="ebayschedule" field="StartTime" title="la_fld_StartTime"/>
+		<inp2:m_RenderElement name="inp_edit_time" prefix="ebayschedule" field="EndTime" title="la_fld_EndTime"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="ebayschedule" field="ContinueUntilQty" title="la_fld_ContinueUntilQuantity" size="4"/>
+		<inp2:m_RenderElement name="inp_label" prefix="ebayschedule" field="LastProcessed" title="la_fld_LastProcessed"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-bulletin/admin_templates/polls/answer_edit.tpl
===================================================================
--- in-bulletin/admin_templates/polls/answer_edit.tpl	(revision 13916)
+++ in-bulletin/admin_templates/polls/answer_edit.tpl	(working copy)
@@ -81,13 +81,13 @@
 
 <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="poll-answer" field="PollId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="poll-answer" field="AnswerId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll-answer" field="Answer" title="!la_fld_PollAnswer!" control_options="{min_height: 100}" cols="70" rows="5"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-answer" field="Priority" title="!la_fld_Priority!" size="5"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-answer" field="VotesQty" title="!la_fld_Votes!" size="5"/>
+			<inp2:m_RenderElement name="inp_label" prefix="poll-answer" field="AnswerId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll-answer" field="Answer" title="la_fld_PollAnswer" control_options="{min_height: 100}" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-answer" field="Priority" title="la_fld_Priority" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-answer" field="VotesQty" title="la_fld_Votes" size="5"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="poll-answer" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: in-bulletin/admin_templates/polls/comment_edit.tpl
===================================================================
--- in-bulletin/admin_templates/polls/comment_edit.tpl	(revision 13916)
+++ in-bulletin/admin_templates/polls/comment_edit.tpl	(working copy)
@@ -79,15 +79,15 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="poll-comment" field="PollId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="poll-comment" field="CommentId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="poll-comment" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="poll-comment" field="CommentBody" title="!la_fld_PollComment!" control_options="{min_height: 100}" cols="70" rows="5"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="!la_fld_PollGuestName!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestEmail" title="!la_fld_PollGuestEmail!" size="40"/>
+			<inp2:m_RenderElement name="inp_label" prefix="poll-comment" field="CommentId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="poll-comment" field="CreatedById" title="la_fld_CreatedById" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="poll-comment" field="CommentBody" title="la_fld_PollComment" control_options="{min_height: 100}" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="la_fld_PollGuestName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestEmail" title="la_fld_PollGuestEmail" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="poll-comment" field="CreatedOn" title="la_fld_CreatedOn"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="Priority" title="la_fld_Priority" size="5"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="poll-comment" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: in-bulletin/admin_templates/polls/poll_edit.tpl
===================================================================
--- in-bulletin/admin_templates/polls/poll_edit.tpl	(revision 13916)
+++ in-bulletin/admin_templates/polls/poll_edit.tpl	(working copy)
@@ -81,26 +81,26 @@
 
 <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_label" prefix="poll" field="PollId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Name" title="!la_fld_Name!" size="50"/>
+			<inp2:m_RenderElement name="inp_label" prefix="poll" field="PollId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Name" title="la_fld_Name" size="50"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll" field="Question" title="!la_fld_Question!" control_options="{min_height: 100}" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll" field="Question" title="la_fld_Question" control_options="{min_height: 100}" cols="70" rows="5"/>
 
 			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="poll" field="Image" title="la_fld_Image"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
 
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="poll" field="CreatedOn" title="la_fld_CreatedOn"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="poll" field="StartDate" title="la_fld_StartDate"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="poll" field="EndDate" title="la_fld_EndDate"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Priority" title="!la_fld_Priority!" size="5"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="RequireLogin" title="!la_fld_RequireLogin!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="AllowComments" title="!la_fld_AllowComments!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="AllowMultipleVotings" title="!la_fld_AllowMultipleVotings!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="CachedVotesQty" title="!la_fld_Votes!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Priority" title="la_fld_Priority" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="RequireLogin" title="la_fld_RequireLogin"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="AllowComments" title="la_fld_AllowComments"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poll" field="AllowMultipleVotings" title="la_fld_AllowMultipleVotings"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="CachedVotesQty" title="la_fld_Votes" size="5"/>
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="poll" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
Index: in-bulletin/admin_templates/topics/images_edit.tpl
===================================================================
--- in-bulletin/admin_templates/topics/images_edit.tpl	(revision 13916)
+++ in-bulletin/admin_templates/topics/images_edit.tpl	(working copy)
@@ -31,22 +31,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="bb-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="bb-img" field="ImageId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="bb-img" field="ImageId" title="la_fld_Id"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="AltName" title="la_fld_AltValue" size="40"/>
 
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-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="bb-img"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-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="bb-img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
 			<inp2:m_RenderElement name="fullsize_section" prefix="bb-img"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: in-bulletin/admin_templates/topics/relations_edit.tpl
===================================================================
--- in-bulletin/admin_templates/topics/relations_edit.tpl	(revision 13916)
+++ in-bulletin/admin_templates/topics/relations_edit.tpl	(working copy)
@@ -31,17 +31,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="bb-rel" field="SourceId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-rel" field="SourceType"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-rel" field="TargetId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="bb-rel" field="TargetType"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="bb-rel" field="RelationshipId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_relation" prefix="bb-rel" field="TargetId" title="!la_fld_TargetId!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb-rel" field="Type" title="!la_fld_RelationshipType!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-rel" field="Enabled" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="bb-rel" field="RelationshipId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_relation" prefix="bb-rel" field="TargetId" title="la_fld_TargetId"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb-rel" field="Type" title="la_fld_RelationshipType"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb-rel" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-rel" field="Priority" title="la_fld_Priority" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-bulletin/admin_templates/topics/review_edit.tpl
===================================================================
--- in-bulletin/admin_templates/topics/review_edit.tpl	(revision 13916)
+++ in-bulletin/admin_templates/topics/review_edit.tpl	(working copy)
@@ -42,17 +42,17 @@
 
 <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="bb-rev" field="ItemId"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="bb-rev" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_label" prefix="bb-rev" field="ReviewId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="bb-rev" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb-rev" field="ReviewText" title="!la_fld_ReviewText!" cols="70" rows="8"/>
+			<inp2:m_RenderElement name="inp_label" prefix="bb-rev" field="ReviewId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="bb-rev" field="CreatedById" title="la_fld_CreatedById" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb-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="bb-rev" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-rev" field="Priority" title="!la_fld_Priority!" size="3" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb-rev" field="CreatedOn" title="!la_fld_CreatedOn!" size="20" class="text"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_General"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb-rev" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb-rev" field="Priority" title="la_fld_Priority" size="3" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb-rev" field="CreatedOn" title="la_fld_CreatedOn" size="20" class="text"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-bulletin/admin_templates/topics/topics_categories.tpl
===================================================================
--- in-bulletin/admin_templates/topics/topics_categories.tpl	(revision 13916)
+++ in-bulletin/admin_templates/topics/topics_categories.tpl	(working copy)
@@ -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="bb-ci" IdField="CategoryId" grid="Default"/>
Index: in-bulletin/admin_templates/topics/topics_edit.tpl
===================================================================
--- in-bulletin/admin_templates/topics/topics_edit.tpl	(revision 13916)
+++ in-bulletin/admin_templates/topics/topics_edit.tpl	(working copy)
@@ -58,34 +58,34 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Topic!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="bb" field="TopicId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Topic"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="bb" field="TopicId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="TopicText" title="la_fld_Subject" size="70"/>
 
 			<inp2:m_if check="bb_FieldEquals" name="Posts" value="0">
 				<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb" field="PostingText" title="la_fld_MessageBody" control_options="{min_height: 100}" cols="70" rows="8"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_user" prefix="bb" field="OwnerId" title="!la_fld_PostedBy!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="bb" field="OwnerId" title="la_fld_PostedBy" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="bb" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="TopicType" title="!la_fld_TopicType!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="NewItem" title="!la_fld_New!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="HotItem" title="!la_fld_Hot!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="PopItem" title="!la_fld_Pop!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb" field="EditorsPick" title="!la_fld_EditorsPick!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="Priority" title="!la_fld_Priority!" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb" field="CreatedOn" title="!la_fld_CreatedOn!"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb" field="Modified" title="!la_fld_Modified!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="TopicType" title="la_fld_TopicType"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="NewItem" title="la_fld_New"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="HotItem" title="la_fld_Hot"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="bb" field="PopItem" title="la_fld_Pop"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb" field="EditorsPick" title="la_fld_EditorsPick"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="Priority" title="la_fld_Priority" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb" field="CreatedOn" title="la_fld_CreatedOn"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="bb" field="Modified" title="la_fld_Modified"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="MetaKeywords" title="la_fld_MetaKeywords" size="70"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb" field="MetaDescription" title="la_fld_MetaDescription" control_options="{min_height: 100}" cols="70" rows="8"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Counters!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="CachedRating" title="!la_fld_Rating!" hint_label="la_prompt_RatingLimits" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="CachedVotesQty" title="!la_fld_Votes!" hint_label="la_prompt_VoteLimits" size="4"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="Views" title="!la_fld_Views!" hint_label="la_prompt_HitLimits" size="4"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Counters"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="CachedRating" title="la_fld_Rating" hint_label="la_prompt_RatingLimits" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="CachedVotesQty" title="la_fld_Votes" hint_label="la_prompt_VoteLimits" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="Views" title="la_fld_Views" hint_label="la_prompt_HitLimits" size="4"/>
 			<input type="hidden" name="Views_original" id="Views_original" value="<inp2:bb_Field name="Views" db="db" />" />
 
 		<!-- custom fields: begin -->
Index: in-bulletin/units/polls/polls_config.php
===================================================================
--- in-bulletin/units/polls/polls_config.php	(revision 13916)
+++ in-bulletin/units/polls/polls_config.php	(working copy)
@@ -117,7 +117,8 @@
 			            	'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => IMAGES_PATH . 'polls/',
 			            	'file_types' => '*.jpg;*.gif;*.png', 'files_description' => '!la_hint_ImageFiles!',
 			            	'multiple' => false, 'thumb_format' => 'resize:200x200',
-			            	'max_len' => 255, 'not_null' => 1, 'default' => ''
+			            	'max_len' => 255, 'not_null' => 1, 'default' => '',
+							'storage_format' => 'resize:20x20',
 			            ),
 			            'Priority' 		=> Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			            'RequireLogin' 	=> Array (
Index: in-commerce/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(revision 13916)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(working copy)
@@ -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: in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	(working copy)
@@ -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_if check="ap_FieldVisible" field="MinPaymentAmount">
 				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
Index: in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/affiliate_plans/affiliates_payout.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliates_payout.tpl	(revision 13916)
+++ in-commerce/admin_templates/affiliate_plans/affiliates_payout.tpl	(working copy)
@@ -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: in-commerce/admin_templates/currencies/currencies_edit.tpl
===================================================================
--- in-commerce/admin_templates/currencies/currencies_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/currencies/currencies_edit.tpl	(working copy)
@@ -55,13 +55,13 @@
 
 <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_if check="curr_FieldVisible" field="RateToPrimary">
 				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="RateToPrimary" title="!la_fld_RateToPrimary!" />
+					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="RateToPrimary" title="la_fld_RateToPrimary" />
 					<td class="control-cell">
 						<input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">
 						<input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">
@@ -73,7 +73,7 @@
 
 			<inp2:m_if check="curr_FieldVisible" field="Symbol">
 				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="Symbol" title="!la_fld_CurrencySymbol!"/>
+					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="Symbol" title="la_fld_CurrencySymbol"/>
 					<td class="control-cell">
 						<input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10">
 						<span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>
@@ -83,12 +83,12 @@
 				</tr>
 			</inp2:m_if>
 
-			<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: in-commerce/admin_templates/discounts/coupon_edit.tpl
===================================================================
--- in-commerce/admin_templates/discounts/coupon_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/discounts/coupon_edit.tpl	(working copy)
@@ -102,21 +102,21 @@
 
 <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="inp_edit_box_generate" prefix="coup" field="Code" title="!la_fld_CouponCode!" 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 name="inp_edit_box_generate" prefix="coup" field="Code" title="la_fld_CouponCode" size="35"/>
 
-			<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 name="inp_edit_box_comment" prefix="coup" field="NumberOfUses" title="!la_fld_NumberOfUses!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box_comment" prefix="coup" field="NumberOfUses" title="la_fld_NumberOfUses" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-commerce/admin_templates/discounts/discount_edit.tpl
===================================================================
--- in-commerce/admin_templates/discounts/discount_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/discounts/discount_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/discounts/gift_certificate_edit.tpl
===================================================================
--- in-commerce/admin_templates/discounts/gift_certificate_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/discounts/gift_certificate_edit.tpl	(working copy)
@@ -95,33 +95,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"/>
@@ -145,24 +145,24 @@
 			</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"/>
-				<inp2:m_RenderElement name="inp_edit_box_generate" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box_generate" prefix="gc" field="Code" title="la_fld_Code" size="35"/>
 			</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: in-commerce/admin_templates/export.tpl
===================================================================
--- in-commerce/admin_templates/export.tpl	(revision 13916)
+++ in-commerce/admin_templates/export.tpl	(working copy)
@@ -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: in-commerce/admin_templates/export_finish.tpl
===================================================================
--- in-commerce/admin_templates/export_finish.tpl	(revision 13916)
+++ in-commerce/admin_templates/export_finish.tpl	(working copy)
@@ -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: in-commerce/admin_templates/import.tpl
===================================================================
--- in-commerce/admin_templates/import.tpl	(revision 13916)
+++ in-commerce/admin_templates/import.tpl	(working copy)
@@ -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"/>
 
 			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename"/>
Index: in-commerce/admin_templates/manufacturers/manufacturers_edit.tpl
===================================================================
--- in-commerce/admin_templates/manufacturers/manufacturers_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/manufacturers/manufacturers_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/orders/export/export.tpl
===================================================================
--- in-commerce/admin_templates/orders/export/export.tpl	(revision 13916)
+++ in-commerce/admin_templates/orders/export/export.tpl	(working copy)
@@ -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: in-commerce/admin_templates/orders/export/export_finish.tpl
===================================================================
--- in-commerce/admin_templates/orders/export/export_finish.tpl	(revision 13916)
+++ in-commerce/admin_templates/orders/export/export_finish.tpl	(working copy)
@@ -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: in-commerce/admin_templates/orders/orders_blocks.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_blocks.tpl	(revision 13916)
+++ in-commerce/admin_templates/orders/orders_blocks.tpl	(working copy)
@@ -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: in-commerce/admin_templates/orders/orders_edit.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/orders/orders_edit.tpl	(working copy)
@@ -60,14 +60,14 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
-			<inp2:m_RenderElement name="inp_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_if check="ord_FieldVisible" field="Number">
 					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>
+						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="la_fld_OrderNumber"/>
 						<td class="control-cell">
 							<input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text">
 							-<inp2:m_inc param="tab_index" by="1"/>
@@ -78,32 +78,32 @@
 				</inp2:m_if>
 
 				<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_if check="ord_FieldVisible" field="Number">
 					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>
+						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="la_fld_OrderNumber"/>
 						<td class="control-cell">
 							<inp2:ord_Field field="OrderNumber"/>
 						</td>
@@ -111,24 +111,24 @@
 					</tr>
 				</inp2:m_if>
 
-				<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: in-commerce/admin_templates/orders/orders_edit_billing.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit_billing.tpl	(revision 13916)
+++ in-commerce/admin_templates/orders/orders_edit_billing.tpl	(working copy)
@@ -89,35 +89,35 @@
 
 <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_if check="ord_FieldVisible" field="PaymentCCExpDate">
 						<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-							<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="!la_fld_PaymentCCExpDate!"/>
+							<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate"/>
 							<td class="control-cell">
 								<input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>" id="<inp2:ord_InputName field="PaymentCCExpMonth"/>" value="<inp2:ord_Field field="PaymentCCExpMonth"/>">
 								/
@@ -127,49 +127,49 @@
 						</tr>
 					</inp2:m_if>
 
-					<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_if check="ord_FieldVisible" field="PaymentCCExpDate">
 						<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-							<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="!la_fld_PaymentCCExpDate!"/>
+							<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate"/>
 							<td class="control-cell">
 								<inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/>
 							</td>
@@ -177,43 +177,43 @@
 						</tr>
 					</inp2:m_if>
 
-					<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: in-commerce/admin_templates/orders/orders_edit_preview.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit_preview.tpl	(revision 13916)
+++ in-commerce/admin_templates/orders/orders_edit_preview.tpl	(working copy)
@@ -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: in-commerce/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit_shipping.tpl	(revision 13916)
+++ in-commerce/admin_templates/orders/orders_edit_shipping.tpl	(working copy)
@@ -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="">
 					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
@@ -228,10 +228,10 @@
 					</tr>
 				</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: in-commerce/admin_templates/payment_type/payment_type_edit.tpl
===================================================================
--- in-commerce/admin_templates/payment_type/payment_type_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/payment_type/payment_type_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/payment_type/payment_type_gateway.tpl
===================================================================
--- in-commerce/admin_templates/payment_type/payment_type_gateway.tpl	(revision 13916)
+++ in-commerce/admin_templates/payment_type/payment_type_gateway.tpl	(working copy)
@@ -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: in-commerce/admin_templates/payment_type/payment_type_groups.tpl
===================================================================
--- in-commerce/admin_templates/payment_type/payment_type_groups.tpl	(revision 13916)
+++ in-commerce/admin_templates/payment_type/payment_type_groups.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/access_pricing_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/access_pricing_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/access_pricing_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/file_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/file_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/file_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/images_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/images_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/images_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/option_combinations.tpl
===================================================================
--- in-commerce/admin_templates/products/option_combinations.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/option_combinations.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/option_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/option_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/option_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/pricing_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/pricing_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/pricing_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/products_access.tpl
===================================================================
--- in-commerce/admin_templates/products/products_access.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/products_access.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/products_categories.tpl
===================================================================
--- in-commerce/admin_templates/products/products_categories.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/products_categories.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/products_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/products_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/products_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/products_files.tpl
===================================================================
--- in-commerce/admin_templates/products/products_files.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/products_files.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/products_inventory.tpl
===================================================================
--- in-commerce/admin_templates/products/products_inventory.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/products_inventory.tpl	(working copy)
@@ -98,19 +98,19 @@
 
 <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 name="inp_edit_inventory" prefix="p" field="Qty" title="!la_fld_Qty!" size="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_inventory" prefix="p" field="Qty" title="la_fld_Qty" size="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: in-commerce/admin_templates/products/products_options.tpl
===================================================================
--- in-commerce/admin_templates/products/products_options.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/products_options.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/products_pricing_grid.tpl
===================================================================
--- in-commerce/admin_templates/products/products_pricing_grid.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/products_pricing_grid.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/relations_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/relations_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/relations_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/review_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/review_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/review_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/products/shipping_options.tpl
===================================================================
--- in-commerce/admin_templates/products/shipping_options.tpl	(revision 13916)
+++ in-commerce/admin_templates/products/shipping_options.tpl	(working copy)
@@ -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: in-commerce/admin_templates/reports/reports.tpl
===================================================================
--- in-commerce/admin_templates/reports/reports.tpl	(revision 13916)
+++ in-commerce/admin_templates/reports/reports.tpl	(working copy)
@@ -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: in-commerce/admin_templates/shipping/shipping_brackets.tpl
===================================================================
--- in-commerce/admin_templates/shipping/shipping_brackets.tpl	(revision 13916)
+++ in-commerce/admin_templates/shipping/shipping_brackets.tpl	(working copy)
@@ -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: in-commerce/admin_templates/shipping/shipping_costs.tpl
===================================================================
--- in-commerce/admin_templates/shipping/shipping_costs.tpl	(revision 13916)
+++ in-commerce/admin_templates/shipping/shipping_costs.tpl	(working copy)
@@ -171,16 +171,16 @@
 
 <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="precision_field" prefix="s" title="!la_Precision!"/>
+		<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="precision_field" prefix="s" title="la_Precision"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </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: in-commerce/admin_templates/shipping/shipping_edit.tpl
===================================================================
--- in-commerce/admin_templates/shipping/shipping_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/shipping/shipping_edit.tpl	(working copy)
@@ -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: in-commerce/admin_templates/shipping/shipping_quote_engine_edit.tpl
===================================================================
--- in-commerce/admin_templates/shipping/shipping_quote_engine_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/shipping/shipping_quote_engine_edit.tpl	(working copy)
@@ -73,15 +73,15 @@
 
 <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_if check="sqe_FieldVisible" field="AccountPassword">
 				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="sqe" field="AccountPassword" title="!la_fld_Password!" />
+					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="sqe" field="AccountPassword" title="la_fld_Password" />
 					<td class="control-cell">
 						<input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value="">
 					</td>
@@ -90,24 +90,24 @@
 			</inp2:m_if>
 
 	<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: in-commerce/admin_templates/shipping/shipping_type_groups.tpl
===================================================================
--- in-commerce/admin_templates/shipping/shipping_type_groups.tpl	(revision 13916)
+++ in-commerce/admin_templates/shipping/shipping_type_groups.tpl	(working copy)
@@ -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: in-commerce/admin_templates/shipping/zone_edit.tpl
===================================================================
--- in-commerce/admin_templates/shipping/zone_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/shipping/zone_edit.tpl	(working copy)
@@ -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" />
Index: in-commerce/admin_templates/taxes/taxes_edit.tpl
===================================================================
--- in-commerce/admin_templates/taxes/taxes_edit.tpl	(revision 13916)
+++ in-commerce/admin_templates/taxes/taxes_edit.tpl	(working copy)
@@ -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: in-link/admin_templates/export.tpl
===================================================================
--- in-link/admin_templates/export.tpl	(revision 13916)
+++ in-link/admin_templates/export.tpl	(working copy)
@@ -33,7 +33,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="l.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
Index: in-link/admin_templates/export_finish.tpl
===================================================================
--- in-link/admin_templates/export_finish.tpl	(revision 13916)
+++ in-link/admin_templates/export_finish.tpl	(working copy)
@@ -23,7 +23,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: in-link/admin_templates/import.tpl
===================================================================
--- in-link/admin_templates/import.tpl	(revision 13916)
+++ in-link/admin_templates/import.tpl	(working copy)
@@ -89,7 +89,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_RenderElement name="inp_edit_field_caption" prefix="l.import" field="ImportSource" title="la_fld_ImportFilename"/>
 				<td class="control-cell">
Index: in-link/admin_templates/links/file_edit.tpl
===================================================================
--- in-link/admin_templates/links/file_edit.tpl	(revision 13916)
+++ in-link/admin_templates/links/file_edit.tpl	(working copy)
@@ -29,7 +29,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="l-file" fields="ResourceId,FileName,FilePath,Status" title="!la_section_File!"/>
+		<inp2:m_RenderElement name="subsection" prefix="l-file" fields="ResourceId,FileName,FilePath,Status" title="la_section_File"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="l-file" field="ResourceId"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l-file" field="FileName" title="la_fld_Name" size="50" />
 			<inp2:m_RenderElement name="inp_edit_upload" prefix="l-file" field="FilePath" title="la_fld_FilePath" />
Index: in-link/admin_templates/links/images_edit.tpl
===================================================================
--- in-link/admin_templates/links/images_edit.tpl	(revision 13916)
+++ in-link/admin_templates/links/images_edit.tpl	(working copy)
@@ -31,22 +31,22 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="l-img" fields="ResourceId,ImageId,Name,AltName,Enabled,DefaultImg,Priority" title="!la_section_Image!"/>
+		<inp2:m_RenderElement name="subsection" prefix="l-img" fields="ResourceId,ImageId,Name,AltName,Enabled,DefaultImg,Priority" title="la_section_Image"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="l-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-img" field="ImageId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-img" field="ImageId" title="la_fld_Id"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l-img" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l-img" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l-img" field="AltName" title="la_fld_AltValue" size="40"/>
 
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l-img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l-img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l-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="l-img"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="l-img" fields="SameImages" title="!la_section_FullSizeImage!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
+		<inp2:m_RenderElement name="subsection" prefix="l-img" fields="SameImages" title="la_section_FullSizeImage"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l-img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
 			<inp2:m_RenderElement name="fullsize_section" prefix="l-img"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: in-link/admin_templates/links/links_categories.tpl
===================================================================
--- in-link/admin_templates/links/links_categories.tpl	(revision 13916)
+++ in-link/admin_templates/links/links_categories.tpl	(working copy)
@@ -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="l-ci" IdField="CategoryId" grid="Default"/>
Index: in-link/admin_templates/links/links_edit.tpl
===================================================================
--- in-link/admin_templates/links/links_edit.tpl	(revision 13916)
+++ in-link/admin_templates/links/links_edit.tpl	(working copy)
@@ -61,12 +61,12 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="l" fields="LinkId,Name,Description,Url,ReciprocalLinkFound,CreatedById,AutomaticFilename,Filename,CustomTemplate,CategoryId" title="la_section_Link" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="l" field="LinkId" title="!la_fld_Id!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="l" field="Name" title="!la_fld_Name!" size="60" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="l" field="Description" title="!la_fld_Description!" cols="60" rows="5" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Url" title="!la_fld_Url!" size="60" display_original="1"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="l" field="LinkId" title="la_fld_Id" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="l" field="Name" title="la_fld_Name" size="60" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="l" field="Description" title="la_fld_Description" cols="60" rows="5" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Url" title="la_fld_Url" size="60" display_original="1"/>
 			<inp2:m_RenderElement name="inp_label" prefix="l" field="ReciprocalLinkFound" title="la_fld_ReciprocalLinkFound"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="l" field="CreatedById" title="!la_fld_LinkOwner!" size="30" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="l" field="CreatedById" title="la_fld_LinkOwner" size="30" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Filename" title="la_fld_Filename" size="60" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CustomTemplate" title="la_fld_CustomTemplate" size="60" display_original="1"/>
@@ -76,7 +76,7 @@
 			<inp2:m_if check="l_DisplayOriginal" display_original="1">
 				<inp2:m_if check="l_FieldVisible" field="Status">
 					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="l" field="Status" title="!la_fld_Status!"/>
+						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="l" field="Status" title="la_fld_Status"/>
 						<td class="control-cell">
 							<inp2:m_Phrase label="la_UseGridToApproveDecline" />
 						</td>
@@ -86,23 +86,23 @@
 					</tr>
 				</inp2:m_if>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="Status" title="!la_fld_Status!" display_original="1"/>
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="Status" title="la_fld_Status" display_original="1"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="NewItem" title="!la_fld_New!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="HotItem" title="!la_fld_Hot!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="PopItem" title="!la_fld_Pop!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l" field="EditorsPick" title="!la_fld_EditorsPick!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Priority" title="!la_fld_Priority!" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="CreatedOn" title="!la_fld_CreatedOn!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="Expire" title="!la_fld_Expire!" size="12" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="MetaKeywords" title="!la_fld_MetaKeywords!" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="l" field="MetaDescription" title="!la_fld_MetaDescription!" cols="60" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="NewItem" title="la_fld_New" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="HotItem" title="la_fld_Hot" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="PopItem" title="la_fld_Pop" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l" field="EditorsPick" title="la_fld_EditorsPick" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Priority" title="la_fld_Priority" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="CreatedOn" title="la_fld_CreatedOn" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="Expire" title="la_fld_Expire" size="12" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="MetaKeywords" title="la_fld_MetaKeywords" size="60"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="l" field="MetaDescription" title="la_fld_MetaDescription" cols="60" rows="5"/>
 
 		<inp2:m_RenderElement name="subsection" prefix="l" fields="CachedRating,CachedVotesQty,Hits" title="la_section_Counters" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CachedRating" title="!la_fld_Rating!" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CachedVotesQty" title="!la_fld_Votes!" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Hits" title="!la_fld_Hits!" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CachedRating" title="la_fld_Rating" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CachedVotesQty" title="la_fld_Votes" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Hits" title="la_fld_Hits" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
 
 		<!-- custom fields: begin -->
 		<inp2:m_include t="incs/custom_blocks"/>
Index: in-link/admin_templates/links/relations_edit.tpl
===================================================================
--- in-link/admin_templates/links/relations_edit.tpl	(revision 13916)
+++ in-link/admin_templates/links/relations_edit.tpl	(working copy)
@@ -31,17 +31,17 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="l-rel" fields="SourceId,SourceType,TargetId,TargetType,RelationshipId,TargetId,Type,Enabled,Priority" title="!la_section_Relation!"/>
+		<inp2:m_RenderElement name="subsection" prefix="l-rel" fields="SourceId,SourceType,TargetId,TargetType,RelationshipId,TargetId,Type,Enabled,Priority" title="la_section_Relation"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="l-rel" field="SourceId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="l-rel" field="SourceType"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="l-rel" field="TargetId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="l-rel" field="TargetType"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="l-rel" field="RelationshipId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_relation" prefix="l-rel" field="TargetId" title="!la_fld_TargetId!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="l-rel" field="Type" title="!la_fld_RelationshipType!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l-rel" field="Enabled" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="l-rel" field="RelationshipId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_relation" prefix="l-rel" field="TargetId" title="la_fld_TargetId"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="l-rel" field="Type" title="la_fld_RelationshipType"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l-rel" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l-rel" field="Priority" title="la_fld_Priority" size="4"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-link/admin_templates/links/review_edit.tpl
===================================================================
--- in-link/admin_templates/links/review_edit.tpl	(revision 13916)
+++ in-link/admin_templates/links/review_edit.tpl	(working copy)
@@ -42,17 +42,17 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="l-rev" fields="ItemId,TextFormat,ReviewId,CreatedById,ReviewText,Rating" title="!la_Text_Review!"/>
+		<inp2:m_RenderElement name="subsection" prefix="l-rev" fields="ItemId,TextFormat,ReviewId,CreatedById,ReviewText,Rating" title="la_Text_Review"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="l-rev" field="ItemId"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="l-rev" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_label" prefix="l-rev" field="ReviewId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="l-rev" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="l-rev" field="ReviewText" title="!la_fld_ReviewText!" cols="70" rows="8"/>
+			<inp2:m_RenderElement name="inp_label" prefix="l-rev" field="ReviewId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="l-rev" field="CreatedById" title="la_fld_CreatedById" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="l-rev" field="ReviewText" title="la_fld_ReviewText" cols="70" rows="8"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="l-rev" field="Rating" title="la_fld_Rating" class="text"/>
-		<inp2:m_RenderElement name="subsection" prefix="l-rev" fields="Status,Priority,CreatedOn" title="!la_Text_General!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="l-rev" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l-rev" field="Priority" title="!la_fld_Priority!" size="3" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l-rev" field="CreatedOn" title="!la_fld_CreatedOn!" size="20" class="text"/>
+		<inp2:m_RenderElement name="subsection" prefix="l-rev" fields="Status,Priority,CreatedOn" title="la_Text_General"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="l-rev" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l-rev" field="Priority" title="la_fld_Priority" size="3" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l-rev" field="CreatedOn" title="la_fld_CreatedOn" size="20" class="text"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-news/admin_templates/articles/articles_categories.tpl
===================================================================
--- in-news/admin_templates/articles/articles_categories.tpl	(revision 13916)
+++ in-news/admin_templates/articles/articles_categories.tpl	(working copy)
@@ -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="n-ci" IdField="CategoryId" grid="Default"/>
Index: in-news/admin_templates/articles/articles_edit.tpl
===================================================================
--- in-news/admin_templates/articles/articles_edit.tpl	(revision 13916)
+++ in-news/admin_templates/articles/articles_edit.tpl	(working copy)
@@ -61,11 +61,11 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Article" original_title="la_section_OriginalValues" display_original="1"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="n" field="NewsId" title="!la_fld_Id!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Title" title="!la_fld_Title!" size="70" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="n" field="CreatedById" title="!la_fld_Author!" size="25" display_original="1"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="n" field="NewsId" title="la_fld_Id" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Title" title="la_fld_Title" size="70" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="n" field="CreatedById" title="la_fld_Author" size="25" display_original="1"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="!la_fld_Body!" control_options="{min_height: 100}" cols="70" rows="8" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="la_fld_Body" control_options="{min_height: 100}" cols="70" rows="8" display_original="1"/>
 
 			<!-- excerpt: begin -->
 			<inp2:m_if check="n_FieldVisible" field="Excerpt">
@@ -94,34 +94,34 @@
 			<inp2:m_if check="n_DisplayOriginal" display_original="1">
 				<inp2:m_if check="n_FieldVisible" field="Status">
 					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Status" title="!la_fld_Status!"/>
+						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Status" title="la_fld_Status"/>
 						<td class="control-cell">
 							<inp2:m_Phrase label="la_UseGridToApproveDecline" />
 						</td>
 					</tr>
 				</inp2:m_if>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="Status" title="!la_fld_Status!" display_original="1"/>
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="Status" title="la_fld_Status" display_original="1"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="NewItem" title="!la_fld_New!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="HotItem" title="!la_fld_Hot!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="PopItem" title="!la_fld_Pop!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="EditorsPick" title="!la_fld_EditorsPick!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadStory" title="!la_fld_LeadStory!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadCatStory" title="!la_fld_LeadCatStory!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Priority" title="!la_fld_Priority!" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="CreatedOn" title="!la_fld_CreatedOn!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="StartDate" title="!la_fld_StartDate!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="EndOn" title="!la_fld_EndOn!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="NewItem" title="la_fld_New" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="HotItem" title="la_fld_Hot" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="PopItem" title="la_fld_Pop" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="EditorsPick" title="la_fld_EditorsPick" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadStory" title="la_fld_LeadStory" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadCatStory" title="la_fld_LeadCatStory" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Priority" title="la_fld_Priority" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="CreatedOn" title="la_fld_CreatedOn" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="StartDate" title="la_fld_StartDate" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="EndOn" title="la_fld_EndOn" display_original="1"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="MetaKeywords" title="!la_fld_MetaKeywords!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="MetaDescription" title="!la_fld_MetaDescription!" control_options="{min_height: 100}" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="MetaKeywords" title="la_fld_MetaKeywords" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="MetaDescription" title="la_fld_MetaDescription" control_options="{min_height: 100}" cols="70" rows="5"/>
 
 		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Counters" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedRating" title="!la_fld_Rating!" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedVotesQty" title="!la_fld_Votes!" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Hits" title="!la_fld_Hits!" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedRating" title="la_fld_Rating" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedVotesQty" title="la_fld_Votes" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Hits" title="la_fld_Hits" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
 			<input type="hidden" name="Hits_original" id="Hits_original" value="<inp2:n_Field name="Hits" db="db" />" />
 
 		<!-- custom fields: begin -->
Index: in-news/admin_templates/articles/file_edit.tpl
===================================================================
--- in-news/admin_templates/articles/file_edit.tpl	(revision 13916)
+++ in-news/admin_templates/articles/file_edit.tpl	(working copy)
@@ -29,7 +29,7 @@
 
 <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="n-file" field="ResourceId"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="n-file" field="FileName" title="la_fld_Name" size="50" />
 			<inp2:m_RenderElement name="inp_edit_upload" prefix="n-file" field="FilePath" title="la_fld_FilePath" />
Index: in-news/admin_templates/articles/images_edit.tpl
===================================================================
--- in-news/admin_templates/articles/images_edit.tpl	(revision 13916)
+++ in-news/admin_templates/articles/images_edit.tpl	(working copy)
@@ -31,22 +31,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="n-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="n-img" field="ImageId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="n-img" field="ImageId" title="la_fld_Id"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="AltName" title="la_fld_AltValue" size="40"/>
 
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-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="n-img"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-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="n-img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
 			<inp2:m_RenderElement name="fullsize_section" prefix="n-img"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: in-news/admin_templates/articles/relations_edit.tpl
===================================================================
--- in-news/admin_templates/articles/relations_edit.tpl	(revision 13916)
+++ in-news/admin_templates/articles/relations_edit.tpl	(working copy)
@@ -31,17 +31,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="n-rel" field="SourceId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="SourceType"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="TargetId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="TargetType"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="n-rel" field="RelationshipId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_relation" prefix="n-rel" field="TargetId" title="!la_fld_TargetId!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rel" field="Type" title="!la_fld_RelationshipType!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-rel" field="Enabled" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="n-rel" field="RelationshipId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_relation" prefix="n-rel" field="TargetId" title="la_fld_TargetId"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rel" field="Type" title="la_fld_RelationshipType"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-rel" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rel" field="Priority" title="la_fld_Priority" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-news/admin_templates/articles/review_edit.tpl
===================================================================
--- in-news/admin_templates/articles/review_edit.tpl	(revision 13916)
+++ in-news/admin_templates/articles/review_edit.tpl	(working copy)
@@ -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="n-rev" field="ItemId"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="n-rev" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_label" prefix="n-rev" field="ReviewId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="n-rev" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n-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="n-rev" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rev" field="Priority" title="!la_fld_Priority!" size="3" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n-rev" field="CreatedOn" title="!la_fld_CreatedOn!" size="20" class="text"/>
+			<inp2:m_RenderElement name="inp_label" prefix="n-rev" field="ReviewId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="n-rev" field="CreatedById" title="la_fld_CreatedById" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n-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="n-rev" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rev" field="Priority" title="la_fld_Priority" size="3" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n-rev" field="CreatedOn" title="la_fld_CreatedOn" size="20" class="text"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: in-news/admin_templates/category_properties.tpl
===================================================================
--- in-news/admin_templates/category_properties.tpl	(revision 13916)
+++ in-news/admin_templates/category_properties.tpl	(working copy)
@@ -20,13 +20,13 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="!la_fld_cust_n_ItemTemplate!" size="50"/>
+<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="la_fld_cust_n_ItemTemplate" size="50"/>
 
-<inp2:m_RenderElement name="subsection" title="!la_section_RssProperties!"/>
-<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_RssSource" type_field="cust_RssSource" title="!la_fld_RssSource!" size="50"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssUpdateInterval" type_field="cust_RssUpdateIntervalType" title="!la_fld_RssUpdateInterval!" has_empty="1"/>
+<inp2:m_RenderElement name="subsection" title="la_section_RssProperties"/>
+<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_RssSource" type_field="cust_RssSource" title="la_fld_RssSource" size="50"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssUpdateInterval" type_field="cust_RssUpdateIntervalType" title="la_fld_RssUpdateInterval" has_empty="1"/>
 
-<inp2:m_RenderElement name="subsection" title="!la_section_RssExpiration!"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssDefaultExpiration" type_field="cust_RssDefaultExpirationType" title="!la_fld_RssDefaultExpiration!" has_empty="1"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssExpireInterval" type_field="cust_RssExpireIntervalType" title="!la_fld_RssExpireInterval!" has_empty="1"/>
-<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="cust_RssDeleteExpired" title="!la_fld_RssDeleteExpired!"/>
+<inp2:m_RenderElement name="subsection" title="la_section_RssExpiration"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssDefaultExpiration" type_field="cust_RssDefaultExpirationType" title="la_fld_RssDefaultExpiration" has_empty="1"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssExpireInterval" type_field="cust_RssExpireIntervalType" title="la_fld_RssExpireInterval" has_empty="1"/>
+<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="cust_RssDeleteExpired" title="la_fld_RssDeleteExpired"/>
Index: in-news/admin_templates/export.tpl
===================================================================
--- in-news/admin_templates/export.tpl	(revision 13916)
+++ in-news/admin_templates/export.tpl	(working copy)
@@ -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="n.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
Index: in-news/admin_templates/export_finish.tpl
===================================================================
--- in-news/admin_templates/export_finish.tpl	(revision 13916)
+++ in-news/admin_templates/export_finish.tpl	(working copy)
@@ -23,7 +23,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: in-news/admin_templates/import.tpl
===================================================================
--- in-news/admin_templates/import.tpl	(revision 13916)
+++ in-news/admin_templates/import.tpl	(working copy)
@@ -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"/>
 
 			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="ImportSource" title="la_fld_ImportFilename"/>