Index: branches/5.1.x/admin_templates/export_finish.tpl
===================================================================
diff -u -N -r13095 -r13947
--- branches/5.1.x/admin_templates/export_finish.tpl	(.../export_finish.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/export_finish.tpl	(.../export_finish.tpl)	(revision 13947)
@@ -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: branches/5.1.x/admin_templates/export.tpl
===================================================================
diff -u -N -r13924 -r13947
--- branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13924)
+++ branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13947)
@@ -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: branches/5.1.x/admin_templates/import.tpl
===================================================================
diff -u -N -r13924 -r13947
--- branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13924)
+++ branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13947)
@@ -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"/>
 			<inp2:m_RenderElement design="form_row" prefix="l.import" field="ImportSource" title="la_fld_ImportFilename">
 				<td class="control-cell">
 					<table border="0">
Index: branches/5.1.x/admin_templates/links/links_edit.tpl
===================================================================
diff -u -N -r13924 -r13947
--- branches/5.1.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 13924)
+++ branches/5.1.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 13947)
@@ -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"/>
@@ -80,23 +80,23 @@
 					</td>
 				</inp2:m_RenderElement>
 			<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: branches/5.1.x/admin_templates/links/links_categories.tpl
===================================================================
diff -u -N -r13095 -r13947
--- branches/5.1.x/admin_templates/links/links_categories.tpl	(.../links_categories.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/links_categories.tpl	(.../links_categories.tpl)	(revision 13947)
@@ -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: branches/5.1.x/admin_templates/links/relations_edit.tpl
===================================================================
diff -u -N -r13095 -r13947
--- branches/5.1.x/admin_templates/links/relations_edit.tpl	(.../relations_edit.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/relations_edit.tpl	(.../relations_edit.tpl)	(revision 13947)
@@ -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: branches/5.1.x/admin_templates/links/file_edit.tpl
===================================================================
diff -u -N -r13095 -r13947
--- branches/5.1.x/admin_templates/links/file_edit.tpl	(.../file_edit.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/file_edit.tpl	(.../file_edit.tpl)	(revision 13947)
@@ -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: branches/5.1.x/admin_templates/links/review_edit.tpl
===================================================================
diff -u -N -r13095 -r13947
--- branches/5.1.x/admin_templates/links/review_edit.tpl	(.../review_edit.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/review_edit.tpl	(.../review_edit.tpl)	(revision 13947)
@@ -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: branches/5.1.x/admin_templates/links/images_edit.tpl
===================================================================
diff -u -N -r13095 -r13947
--- branches/5.1.x/admin_templates/links/images_edit.tpl	(.../images_edit.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/links/images_edit.tpl	(.../images_edit.tpl)	(revision 13947)
@@ -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>