Index: branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r14572 -r14585
--- branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 14572)
+++ branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 14585)
@@ -247,25 +247,6 @@
 	<inp2:Field field="$field" grid="$grid" plus_or_as_label="1" no_special="no_special" format="$format"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_data_label_ml_td" format="">
-	<span class="<inp2:m_if check="{$SourcePrefix}_HasError" field="$virtual_field">error-cell</inp2:m_if>">
-		<inp2:{$PrefixSpecial}_Field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>
-	</span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="field-required"> *</span></inp2:m_if>:<br />
-
-	<inp2:m_if check="FieldEquals" field="$ElementTypeField" value="textarea">
-		<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
-			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.png" style="cursor:hand;" width="24" height="24" border="0"></a>
-		<inp2:m_else/>
-			<inp2:Field name="FieldName" result_to_var="custom_field"/>
-			<a href="javascript:OpenEditor('&section=in-link:editlink_general', 'kernel_form', '<inp2:{$SourcePrefix}_InputName field="cust_{$custom_field}"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor: hand;" width="24" height="24" border="0"></a>
-		</inp2:m_if>
-	<inp2:m_else/>
-		<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
-			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.png" style="cursor:hand;" width="24" height="24" border="0"></a>
-		</inp2:m_if>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="grid_empty_filter">
 
 </inp2:m_DefineElement>
@@ -524,7 +505,7 @@
 	</table>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_column_title" use_phrases="1">
+<inp2:m_DefineElement name="grid_column_title" title="column:la_fld_{$field}" use_phrases="1">
 	<table style="width: auto" class="layout-only-table"><tr>
 		<td style="vertical-align: middle; padding: 0px">
 			<a
@@ -568,7 +549,7 @@
 	<input type="checkbox" onclick="Grids['<inp2:m_param name="PrefixSpecial"/>'].InvertSelection(); this.checked=false;" ondblclick="Grids['<inp2:m_param name="PrefixSpecial"/>'].ClearSelection(); this.checked=false;" />
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_column_title_no_sorting" use_phrases="1">
+<inp2:m_DefineElement name="grid_column_title_no_sorting" title="column:la_fld_{$field}" use_phrases="1">
 	<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>
 </inp2:m_DefineElement>