Index: branches/5.2.x/admin_templates/shipping/shipping_quote_engine_edit.tpl
===================================================================
diff -u -N -r13845 -r14089
--- branches/5.2.x/admin_templates/shipping/shipping_quote_engine_edit.tpl	(.../shipping_quote_engine_edit.tpl)	(revision 13845)
+++ branches/5.2.x/admin_templates/shipping/shipping_quote_engine_edit.tpl	(.../shipping_quote_engine_edit.tpl)	(revision 14089)
@@ -73,41 +73,37 @@
 
 <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!" />
-					<td class="control-cell">
-						<input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value="">
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="sqe" field="AccountPassword"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" 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>
+			</inp2:m_RenderElement>
 
 	<inp2:m_if check="sqe_Field" field="ClassName" equals_to="Intershipper" db="db">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Carriers!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Carriers"/>
 			<inp2:m_RenderElement name="carrier" carrier="UPS" title="UPS" />
 			<inp2:m_RenderElement name="carrier" carrier="FDX" title="FedEx" />
 			<inp2:m_RenderElement name="carrier" carrier="DHL" title="DHL" />
 			<inp2:m_RenderElement name="carrier" carrier="USP" title="USPS" />
 			<inp2:m_RenderElement name="carrier" carrier="ARB" title="Airborne" />
 
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Delivery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="1DYEnabled" title="!la_fld_FirstDayDelivery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="2DYEnabled" title="!la_fld_SecondDayDelivery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="3DYEnabled" title="!la_fld_ThirdDayDelivery!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="GNDEnabled" title="!la_fld_GroundDelivery!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Delivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="1DYEnabled" title="la_fld_FirstDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="2DYEnabled" title="la_fld_SecondDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="3DYEnabled" title="la_fld_ThirdDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="GNDEnabled" title="la_fld_GroundDelivery"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Other!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="sqe" field="ShipMethod" title="!la_fld_ShipMethod!"/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Other"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="sqe" field="ShipMethod" title="la_fld_ShipMethod"/>
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="FlatSurcharge" title="!la_fld_FlatSurcharge!" size="10"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="PercentSurcharge" title="!la_fld_PercentSurcharge!" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="FlatSurcharge" title="la_fld_FlatSurcharge" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="PercentSurcharge" title="la_fld_PercentSurcharge" size="10"/>
 	</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>