Index: branches/1.1.x/units/widgets/widgets_config.php
===================================================================
diff -u -N -r14354 -r14529
--- branches/1.1.x/units/widgets/widgets_config.php	(.../widgets_config.php)	(revision 14354)
+++ branches/1.1.x/units/widgets/widgets_config.php	(.../widgets_config.php)	(revision 14529)
@@ -194,18 +194,18 @@
 			'Default' => Array (
 	//			'Icons' => Array ('default' => 'icon16_custom.gif'),
 				'Fields' => Array (
-					'WidgetId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-					'Title' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_custom_td'),
-					'Image' => Array ('title' => 'la_col_Image', 'data_block' => 'grid_image_td'),
-					'Type' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'),
-					'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
-					'Good' => Array ('title' => 'la_col_Good'),
-					'Qty' => Array ('title' => 'la_col_Qty', 'header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_float_range_filter'),
-					'Email' => Array ('title' => 'la_col_Email'),
-					'Phone' => Array ('title' => 'la_col_Phone'),
-					'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
-					'Description' => Array ('title' => 'la_col_Description'),
-					'VirtualActionField' => Array ('title' => 'la_col_Action', 'data_block' => 'grid_delete_td'),
+					'WidgetId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+					'Title' => Array ('title' => 'column:la_fld_Name', 'data_block' => 'grid_custom_td'),
+					'Image' => Array ('data_block' => 'grid_image_td'),
+					'Type' => Array ('filter_block' => 'grid_options_filter'),
+					'Status' => Array ('filter_block' => 'grid_options_filter'),
+					'Good' => Array ('filter_block' => 'grid_like_filter'),
+					'Qty' => Array ('header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_float_range_filter'),
+					'Email' => Array ('filter_block' => 'grid_like_filter'),
+					'Phone' => Array ('filter_block' => 'grid_like_filter'),
+					'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'),
+					'Description' => Array ('filter_block' => 'grid_like_filter'),
+					'VirtualActionField' => Array ('title' => 'column:la_fld_Action', 'data_block' => 'grid_delete_td'),
 				),
 			),
 		),
Index: branches/1.1.x/admin_templates/widgets/widget_edit.tpl
===================================================================
diff -u -N -r14287 -r14529
--- branches/1.1.x/admin_templates/widgets/widget_edit.tpl	(.../widget_edit.tpl)	(revision 14287)
+++ branches/1.1.x/admin_templates/widgets/widget_edit.tpl	(.../widget_edit.tpl)	(revision 14529)
@@ -67,23 +67,23 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="$prefix" field="$id_field" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Title" title="la_fld_Title" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="$prefix" field="Good" title="la_fld_Good"/>
-			<inp2:m_RenderElement name="inp_edit_fck" prefix="$prefix" field="Description" title="la_fld_Description"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="$prefix" field="Status" title="la_fld_Status"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="$prefix" field="Type" title="la_fld_Type" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Title" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="$prefix" field="Good"/>
+			<inp2:m_RenderElement name="inp_edit_fck" prefix="$prefix" field="Description"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="$prefix" field="Status"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="$prefix" field="Type" has_empty="1"/>
 
 		<!--##
-			<inp2:m_RenderElement name="inp_edit_date" prefix="$prefix" field="CreatedOn" title="la_fld_CreatedOn"/>			
+			<inp2:m_RenderElement name="inp_edit_date" prefix="$prefix" field="CreatedOn"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="$prefix" field="IsSystem" title="la_fld_IsSystemTemplate" onchange="OnSystemClick()"/>
 		##-->
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Qty" title="la_fld_Qty" style="width: 50px"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="$prefix" field="Phone" title="la_fld_Phone"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Email" title="la_fld_Email" style="width: 200px"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Qty" style="width: 50px"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="$prefix" field="Phone"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Email" style="width: 200px"/>
 
-			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="Image" title="la_fld_Image"/>
-			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="DataFile" title="la_fld_DataFile"/>
+			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="Image"/>
+			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="DataFile"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/1.1.x/install/english.lang
===================================================================
diff -u -N -r14249 -r14529
--- branches/1.1.x/install/english.lang	(.../english.lang)	(revision 14249)
+++ branches/1.1.x/install/english.lang	(.../english.lang)	(revision 14529)
@@ -1,10 +1,8 @@
-<LANGUAGES>
-	<LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><UNITSYSTEM>2</UNITSYSTEM>
+<LANGUAGES Version="4">
+	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
 		<PHRASES>
-			<PHRASE Label="la_col_Good" Module="Custom" Type="1">R29vZA==</PHRASE>
-			<PHRASE Label="la_col_Phone" Module="Custom" Type="1">UGhvbmU=</PHRASE>
 			<PHRASE Label="la_fld_DataFile" Module="Custom" Type="1">RGF0YSBmaWxl</PHRASE>
-			<PHRASE Label="la_fld_Good" Module="Custom" Type="1">R29vZA==</PHRASE>
+			<PHRASE Label="la_fld_Good" Module="Custom" Type="1" Column="R29vZA==">R29vZA==</PHRASE>
 			<PHRASE Label="la_opt_Custom" Module="Custom" Type="1">Q3VzdG9t</PHRASE>
 			<PHRASE Label="la_opt_Default" Module="Custom" Type="1">RGVmYXVsdA==</PHRASE>
 			<PHRASE Label="la_tab_Widgets" Module="Custom" Type="1">V2lkZ2V0cw==</PHRASE>