Index: branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
diff -u -N -r13923 -r13946
--- branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13923)
+++ branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13946)
@@ -80,18 +80,18 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_OrderShipping!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_OrderShipping"/>
 
 			<inp2:m_if check="ord_OrderEditable">
 
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="!la_fld_ShippingTo!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="!la_fld_ShippingCompany!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="!la_fld_ShippingPhone!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingFax" title="!la_fld_ShippingFax!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="!la_fld_ShippingEmail!" size="20"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="!la_fld_ShippingAddress1!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="!la_fld_ShippingAddress2!" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="!la_fld_ShippingCity!" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="la_fld_ShippingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="la_fld_ShippingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="la_fld_ShippingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingFax" title="la_fld_ShippingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="la_fld_ShippingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="la_fld_ShippingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="la_fld_ShippingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="la_fld_ShippingCity" size="20"/>
 
 				<script type="text/javascript">
 					function update_address()
@@ -100,15 +100,15 @@
 					}
 				</script>
 
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="!la_fld_ShippingState!" size="20" />
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="!la_fld_ShippingZip!" size="10"/>
-				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="!la_fld_ShippingCountry!" size="20" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="la_fld_ShippingState" size="20" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="la_fld_ShippingZip" size="10"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="la_fld_ShippingCountry" size="20" />
 
 				<inp2:m_DefineElement name="order_option">
 					<input onclick="submit_event('ord','OnQuietPreSave');"  class="simple" type="radio" <inp2:m_param name="checked"/> name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;<br>
 				</inp2:m_DefineElement>
 
-				<!-- <inp2:m_RenderElement name="inp_edit_radio" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOption!" size="20" /> -->
+				<!-- <inp2:m_RenderElement name="inp_edit_radio" prefix="ord" field="ShippingOption" title="la_fld_ShippingOption" size="20" /> -->
 
 				<inp2:m_DefineElement name="order_shipping_type">
 					<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
@@ -154,22 +154,22 @@
 					</td>
 				</tr>
 
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCost" title="!la_fld_ShippingCost!" size="10"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="!la_fld_InsuranceFee!" size="10" currency="selected"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/>
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="!la_fld_ShippingDate!" size="16"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" currency="selected"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCustomerAccount" title="la_fld_ShippingCustomerAccount" size="30"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate" size="16"/>
 
 			<inp2:m_else/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingTo" title="!la_fld_ShippingTo!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCompany" title="!la_fld_ShippingCompany!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingPhone" title="!la_fld_ShippingPhone!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingFax" title="!la_fld_ShippingFax!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingEmail" title="!la_fld_ShippingEmail!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress1" title="!la_fld_ShippingAddress1!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress2" title="!la_fld_ShippingAddress2!" size="40"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCity" title="!la_fld_ShippingCity!" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingTo" title="la_fld_ShippingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCompany" title="la_fld_ShippingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingPhone" title="la_fld_ShippingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingFax" title="la_fld_ShippingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingEmail" title="la_fld_ShippingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress1" title="la_fld_ShippingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress2" title="la_fld_ShippingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCity" title="la_fld_ShippingCity" size="20"/>
 
 				<script type="text/javascript">
 					function update_address()
@@ -178,16 +178,16 @@
 					}
 				</script>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCountry" title="!la_fld_ShippingCountry!" size="20"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingState" title="!la_fld_ShippingState!" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCountry" title="la_fld_ShippingCountry" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingState" title="la_fld_ShippingState" size="20"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingZip" title="!la_fld_ShippingZip!" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingZip" title="la_fld_ShippingZip" size="10"/>
 
 				<inp2:m_DefineElement name="order_option_label">
 					<inp2:m_param name="key"/> <inp2:m_phrase label="$option"/>
 				</inp2:m_DefineElement>
 
-				<!--inp2:m_ParseBlock name="inp_edit_radio" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOption!" size="20"/-->
+				<!--inp2:m_ParseBlock name="inp_edit_radio" prefix="ord" field="ShippingOption" title="la_fld_ShippingOption" size="20"/-->
 
 				<inp2:m_DefineElement name="order_shipping_type">
 					<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
@@ -197,7 +197,7 @@
 					<inp2:m_param name="shipment"/> - <inp2:ord_PrintShippingTypes block="order_shipping_type" currency="selected" selected_only="1"/>
 				</inp2:m_DefineElement>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOptions!" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingOption" title="la_fld_ShippingOptions" size="10"/>
 
 				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 					<inp2:m_inc param="tab_index" by="1"/>
@@ -210,10 +210,10 @@
 					</td>
 				</tr>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCost" title="!la_fld_ShippingCost!" size="10" format="$ %.2f"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10" format="$ %.2f"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="!la_fld_InsuranceFee!" size="10" format="$ %.2f"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" format="$ %.2f"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="la_fld_ShippingCustomerAccount" size="30"/>
 
 				<inp2:m_DefineElement name="inp_shipping_label" is_last="" as_label="" currency="" is_last="">
 					<inp2:m_RenderElement design="form_row" pass_params="1">
@@ -227,10 +227,10 @@
 					</inp2:m_RenderElement>
 				</inp2:m_DefineElement>
 
-				<inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/>
+				<inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30"/>
 
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingDate" title="!la_fld_ShippingDate!" size="16"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate" size="16"/>
 
 			</inp2:m_if>