Index: branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl	(.../gift_certificate_edit.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl	(.../gift_certificate_edit.tpl)	(revision 13946)
@@ -82,33 +82,33 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="gc" field="GiftCertificateId" title="la_fld_Id"/>
 
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Purchaser" title="!la_fld_SenderName!" size="35"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Recipient" title="!la_fld_RecipientName!" size="35"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Message" title="!la_fld_MessageText!" cols="35" rows="7"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Amount" title="!la_fld_Amount!" size="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Purchaser" title="la_fld_SenderName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Recipient" title="la_fld_RecipientName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Message" title="la_fld_MessageText" cols="35" rows="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Amount" title="la_fld_Amount" size="7"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="SendVia" title="!la_fld_DeliveryMethod!"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="SendVia" title="la_fld_DeliveryMethod"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Purchaser" title="!la_fld_SenderName!" size="35"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Recipient" title="!la_fld_RecipientName!" size="35"/>
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="gc" field="Message" title="!la_fld_MessageText!" cols="35" rows="7"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Amount" title="!la_fld_Amount!" size="7"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Purchaser" title="la_fld_SenderName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Recipient" title="la_fld_RecipientName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="gc" field="Message" title="la_fld_MessageText" cols="35" rows="7"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Amount" title="la_fld_Amount" size="7"/>
 
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="SendVia" title="!la_fld_DeliveryMethod!"/>
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="SendVia" title="la_fld_DeliveryMethod"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_EmailDelivery!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_EmailDelivery"/>
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientEmail" title="!la_fld_Email!" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientEmail" title="la_fld_Email" size="35"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientEmail" title="!la_fld_Email!" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientEmail" title="la_fld_Email" size="35"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_PostalDelivery!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_PostalDelivery"/>
 			<inp2:m_if check="gc_HasOrder">
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientFirstname" title="la_fld_FirstName" size="35"/>
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientLastname" title="la_fld_LastName" size="35"/>
@@ -132,11 +132,11 @@
 			</inp2:m_if>
 
 		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="Status" title="!la_fld_Status!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="Status" title="la_fld_Status"/>
 
 			<inp2:m_if check="gc_HasOrder">
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="la_fld_Code" size="35"/>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
 
@@ -149,13 +149,13 @@
 			</inp2:m_if>
 
 			<inp2:m_if check="gc_IsNewItem" inverse="inverse">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Debit" title="!la_fld_RemainingAmount!" size="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Debit" title="la_fld_RemainingAmount" size="7"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Expiration" title="!la_fld_Expiration!" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Expiration" title="la_fld_Expiration" size="10"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="Expiration" title="!la_fld_Expiration!" size="10"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="Expiration" title="la_fld_Expiration" size="10"/>
 			</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>