Index: branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -N -r14155 -r14161
--- branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 14155)
+++ branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 14161)
@@ -60,7 +60,7 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
-			<!--## <inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="la_fld_EventType"/> ##-->
+			<!--## <inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="la_fld_Type"/> ##-->
 
 			<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="l{$language_id}_Subject" title="la_fld_Subject" size="60"/>
Index: branches/5.1.x/core/units/structure/structure_config.php
===================================================================
diff -u -N -r13962 -r14161
--- branches/5.1.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 13962)
+++ branches/5.1.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: structure_config.php 13962 2010-09-25 18:38:45Z alex $
+* @version	$Id: structure_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -88,8 +88,6 @@
 				'format' => "#st_status# '#st_titlefield#'",
 			),
 
-			'all_pages_list'	=>	Array('prefixes' =>	Array('st.all_List'), 'format' => "!la_title_AllPages!"),
-
 			'edit_content' => array('format' => '!la_EditingContent!'),
 
 /*			'categories_edit'		=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),*/
Index: branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl
===================================================================
diff -u -N -r13941 -r14161
--- branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 13941)
+++ branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 14161)
@@ -59,11 +59,7 @@
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].showIcon = true;
 
 		<inp2:m_if check="m_ParamEquals" name="menu_columns" value="yes">
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.columns'),'<inp2:m_Phrase label="la_SelectColumns" html_escape="1" js_escape="1"/>','javascript:openSelector("<inp2:m_param name="PrefixSpecial"/>", "<inp2:m_Link template="popups/column_picker" grid_name="$grid" no_amp="1"/>")');
-			<!--##
-			// currently the widths are saved automatically shortly after it have been changed
-			// $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.save_view'),'<inp2:m_Phrase label="la_SaveView" escape="1"/>','javascript:myGrid.SaveWidths()');
-			##-->
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.columns'),'<inp2:m_Phrase label="la_SelectColumns" html_escape="1" js_escape="1"/>','javascript:openSelector("<inp2:m_param name="PrefixSpecial"/>", "<inp2:m_Link template="popups/column_picker" grid_name="$grid" no_amp="1"/>")');			
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="menu_auto_refresh" value="yes">
Index: branches/5.1.x/core/install/install_schema.sql
===================================================================
diff -u -N -r14109 -r14161
--- branches/5.1.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 14109)
+++ branches/5.1.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 14161)
@@ -1,8 +1,7 @@
 CREATE TABLE PermissionConfig (
   PermissionConfigId int(11) NOT NULL auto_increment,
   PermissionName varchar(30) NOT NULL default '',
-  Description varchar(255) NOT NULL default '',
-  ErrorMessage varchar(255) NOT NULL default '',
+  Description varchar(255) NOT NULL default '',  
   ModuleId varchar(20) NOT NULL default '0',
   PRIMARY KEY  (PermissionConfigId),
   KEY PermissionName (PermissionName)
Index: branches/5.1.x/core/units/forms/forms/forms_config.php
===================================================================
diff -u -N -r14155 -r14161
--- branches/5.1.x/core/units/forms/forms/forms_config.php	(.../forms_config.php)	(revision 14155)
+++ branches/5.1.x/core/units/forms/forms/forms_config.php	(.../forms_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: forms_config.php 14155 2011-01-11 10:04:17Z alex $
+* @version	$Id: forms_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -165,7 +165,7 @@
 								'type' => 'string', 'max_len' => 255,
 								'error_msgs' => Array (
 									'connection_failed' => '!la_error_ConnectionFailed!',
-									'message_listing_failed' => '!la_error_MessageListingFailed!',
+									'message_listing_failed' => '!la_error_MessagesListReceivingFailed!',
 								),
 								'not_null' => 1, 'default' => ''
 							),
Index: branches/5.1.x/core/units/forms/submission_log/submission_log_config.php
===================================================================
diff -u -N -r13400 -r14161
--- branches/5.1.x/core/units/forms/submission_log/submission_log_config.php	(.../submission_log_config.php)	(revision 13400)
+++ branches/5.1.x/core/units/forms/submission_log/submission_log_config.php	(.../submission_log_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: submission_log_config.php 13400 2010-04-25 12:37:19Z alex $
+* @version	$Id: submission_log_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -78,7 +78,7 @@
 			'Attachment' => Array (
 				'type' => 'string',
 				'formatter' => 'kUploadFormatter', 'upload_dir' => SUBMISSION_LOG_ATTACHMENT_PATH,
-            	'file_types' => '*.*', 'files_description' => '!la_hint_AnyFiles!', 'multiple' => 100,
+            	'file_types' => '*.*', 'files_description' => '!la_hint_AllFiles!', 'multiple' => 100,
 				'default' => NULL
 			),
 
Index: branches/5.1.x/core/units/translator/translator_config.php
===================================================================
diff -u -N -r13086 -r14161
--- branches/5.1.x/core/units/translator/translator_config.php	(.../translator_config.php)	(revision 13086)
+++ branches/5.1.x/core/units/translator/translator_config.php	(.../translator_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: translator_config.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: translator_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -30,25 +30,16 @@
 											),
 					'IDField'			=>	'N/A',
 
-					'TitlePhrase'	=> 'la_text_Translation',
+					'TitlePresets' => Array (												
+						'trans_edit' => Array (
+							'prefixes' => Array('trans'), 'format' => '!la_title_EditingTranslation!',
+							'toolbar_buttons' => Array ('select', 'cancel'),
+						),
+					),
 
-					'TitlePresets'		=>	Array(
-												'default'	=>	Array(
-													'new_status_labels'		=> Array('trans'=>'!la_title_Adding_Order!'),
-													'edit_status_labels'	=> Array('trans'=>'!la_title_Editing_Order!'),
-													'new_titlefield'		=> Array('trans'=>''),
-													),
-
-												'trans_edit'	=>	Array(
-													'prefixes' => Array('trans'), 'format' => '!la_title_EditingTranslation!',
-													'toolbar_buttons' => Array ('select', 'cancel'),
-													),
-											),
-
 					'ItemSQLs'			=>	Array ('' => ''),
 
-					'Fields'			=>	Array(
-									        ),
+					'Fields'			=>	Array( ),
 
 					'VirtualFields'	=> 	Array(
 						'Original' => Array(),
Index: branches/5.1.x/core/units/statistics/statistics_config.php
===================================================================
diff -u -N -r13159 -r14161
--- branches/5.1.x/core/units/statistics/statistics_config.php	(.../statistics_config.php)	(revision 13159)
+++ branches/5.1.x/core/units/statistics/statistics_config.php	(.../statistics_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: statistics_config.php 13159 2010-02-24 10:45:00Z alex $
+* @version	$Id: statistics_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -35,9 +35,11 @@
 
 					'TitleField'		=>	'ListLabel',
 
-					'TitlePresets'		=>	Array(
-												'statistics_list'		=>	Array('prefixes' => Array('stat_List'), 'format' => "!la_title_Statistics!"),
-											),
+					'TitlePresets' => Array (
+						'statistics_list' => Array (
+							'prefixes' => Array ('stat_List'), 'format' => "!la_title_Statistics!",
+						),
+					),
 
 					'TableName'			=>	TABLE_PREFIX.'StatItem',
 
Index: branches/5.1.x/core/units/email_events/email_events_config.php
===================================================================
diff -u -N -r14105 -r14161
--- branches/5.1.x/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 14105)
+++ branches/5.1.x/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_config.php 14105 2011-01-05 09:48:37Z alex $
+* @version	$Id: email_events_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -61,8 +61,7 @@
 			),
 
 			// for mass mailing
-			'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
-			'email_prepare' => Array ('prefixes' => Array (), 'format' => '!la_title_PreparingEmailsForSending!. !la_title_PleaseWait!'),
+			'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),			
 			'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
 			'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'),
 		),
Index: branches/5.1.x/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -N -r13159 -r14161
--- branches/5.1.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 13159)
+++ branches/5.1.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_logs_config.php 13159 2010-02-24 10:45:00Z alex $
+* @version	$Id: email_logs_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -83,7 +83,7 @@
 					'subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200,  ),
 					'event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 170,  ),
 					'timestamp' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145,  ),
-//					'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter', ),
+					// 'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter', ),
 				),
 			),
 		),
Index: branches/5.1.x/core/install/english.lang
===================================================================
diff -u -N -r14106 -r14161
--- branches/5.1.x/core/install/english.lang	(.../english.lang)	(revision 14106)
+++ branches/5.1.x/core/install/english.lang	(.../english.lang)	(revision 14161)
@@ -67,9 +67,13 @@
 			<PHRASE Label="la_col_AffectedItems" Module="Core" Type="1">QWZmZWN0ZWQgSXRlbXM=</PHRASE>
 			<PHRASE Label="la_col_AltName" Module="Core" Type="1">QWx0IFZhbHVl</PHRASE>
 			<PHRASE Label="la_col_Basedon" Module="Core" Type="1">QmFzZWQgT24=</PHRASE>
+			<PHRASE Label="la_col_Bcc" Module="Core" Type="1">QmNj</PHRASE>
+			<PHRASE Label="la_col_BounceDate" Module="Core" Type="1">Qm91bmNlZCBPbg==</PHRASE>
+			<PHRASE Label="la_col_BounceInfo" Module="Core" Type="1">Qm91bmNlIEluZm8=</PHRASE>
 			<PHRASE Label="la_col_BuildDate" Module="Core" Type="1">QnVpbGQgRGF0ZQ==</PHRASE>
 			<PHRASE Label="la_col_Category" Module="Core" Type="1">U2VjdGlvbg==</PHRASE>
 			<PHRASE Label="la_col_CategoryName" Module="Core" Type="1">U2VjdGlvbiBOYW1l</PHRASE>
+			<PHRASE Label="la_col_Cc" Module="Core" Type="1">Q2M=</PHRASE>
 			<PHRASE Label="la_col_Changes" Module="Core" Type="1">Q2hhbmdlcw==</PHRASE>
 			<PHRASE Label="la_col_Charset" Module="Core" Type="1">Q2hhcnNldA==</PHRASE>
 			<PHRASE Label="la_col_Country" Module="Core" Type="1">Q291bnRyeQ==</PHRASE>
@@ -90,6 +94,7 @@
 			<PHRASE Label="la_col_Error" Module="Core" Type="1">Jm5ic3A7</PHRASE>
 			<PHRASE Label="la_col_Event" Module="Core" Type="1">RXZlbnQ=</PHRASE>
 			<PHRASE Label="la_col_EventDescription" Module="Core" Type="1">RXZlbnQgRGVzY3JpcHRpb24=</PHRASE>
+			<PHRASE Label="la_col_EventParams" Module="Core" Type="1">RXZlbnQgUGFyYW1z</PHRASE>
 			<PHRASE Label="la_col_FieldComparision" Module="Core" Type="1">TWF0Y2ggVHlwZQ==</PHRASE>
 			<PHRASE Label="la_col_FieldName" Module="Core" Type="1">RmllbGQgTmFtZQ==</PHRASE>
 			<PHRASE Label="la_col_FieldValue" Module="Core" Type="1">TWF0Y2ggVmFsdWU=</PHRASE>
@@ -146,6 +151,7 @@
 			<PHRASE Label="la_col_Name" Module="Core" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_col_NextRunOn" Module="Core" Type="1">TmV4dCBSdW4gT24=</PHRASE>
 			<PHRASE Label="la_col_OccuredOn" Module="Core" Type="1">T2NjdXJlZCBPbg==</PHRASE>
+			<PHRASE Label="la_col_OriginalValue" Module="Core" Type="1">T3JpZ2luYWwgVmFsdWU=</PHRASE>
 			<PHRASE Label="la_col_PackName" Module="Core" Type="1">UGFjayBOYW1l</PHRASE>
 			<PHRASE Label="la_col_PageTitle" Module="Core" Type="1">U2VjdGlvbiBUaXRsZQ==</PHRASE>
 			<PHRASE Label="la_col_Path" Module="Core" Type="1">UGF0aA==</PHRASE>
@@ -161,6 +167,7 @@
 			<PHRASE Label="la_col_PortalUserId" Module="Core" Type="1">VXNlciBJRA==</PHRASE>
 			<PHRASE Label="la_col_Prefix" Module="Core" Type="1">UHJlZml4</PHRASE>
 			<PHRASE Label="la_col_Preview" Module="Core" Type="1">UHJldmlldw==</PHRASE>
+			<PHRASE Label="la_col_Primary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
 			<PHRASE Label="la_col_PrimaryGroup" Module="Core" Type="1">UHJpbWFyeSBHcm91cA==</PHRASE>
 			<PHRASE Label="la_col_PrimaryValue" Module="Core" Type="1">UHJpbWFyeSBWYWx1ZQ==</PHRASE>
 			<PHRASE Label="la_col_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE>
@@ -315,6 +322,7 @@
 			<PHRASE Label="la_EmptyFile" Module="Core" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE>
 			<PHRASE Label="la_empty_file" Module="Core" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE>
 			<PHRASE Label="la_Enabled" Module="Core" Type="1">RW5hYmxlZA==</PHRASE>
+			<PHRASE Label="la_error_CantOpenFile" Module="Core" Type="1">Q2FuJ3Qgb3BlbiB0aGUgZmlsZQ==</PHRASE>
 			<PHRASE Label="la_error_cant_save_file" Module="Core" Type="1">Q2FuJ3Qgc2F2ZSBhIGZpbGU=</PHRASE>
 			<PHRASE Label="la_error_ConnectionFailed" Module="Core" Type="1">Q29ubmVjdGlvbiBGYWlsZWQ=</PHRASE>
 			<PHRASE Label="la_error_copy_subcategory" Module="Core" Type="1">RXJyb3IgY29weWluZyBzdWJzZWN0aW9ucw==</PHRASE>
@@ -324,13 +332,19 @@
 			<PHRASE Label="la_error_InvalidFileFormat" Module="Core" Type="1">SW52YWxpZCBGaWxlIEZvcm1hdA==</PHRASE>
 			<PHRASE Label="la_error_invalidoption" Module="Core" Type="1">aW52YWxpZCBvcHRpb24=</PHRASE>
 			<PHRASE Label="la_error_LoginFailed" Module="Core" Type="1">TG9naW4gRmFpbGVk</PHRASE>
+			<PHRASE Label="la_error_MessagesListReceivingFailed" Module="Core" Type="1">UmVjZWl2aW5nIGxpc3Qgb2YgbWVzc2FnZXMgZnJvbSB0aGUgU2VydmVyIGhhcyBmYWlsZWQ=</PHRASE>
 			<PHRASE Label="la_error_move_subcategory" Module="Core" Type="1">RXJyb3IgbW92aW5nIHN1YnNlY3Rpb24=</PHRASE>
 			<PHRASE Label="la_error_NoInheritancePossible" Module="Core" Type="1">Q2FuJ3QgaW5oZXJpdCB0ZW1wbGF0ZSBmcm9tIHRvcCBjYXRlZ29yeQ==</PHRASE>
+			<PHRASE Label="la_error_NoMatchingColumns" Module="Core" Type="1">Tm8gbWF0Y2hpbmcgY29sdW1ucyBhcmUgZm91bmQ=</PHRASE>
+			<PHRASE Label="la_error_OperationNotAllowed" Module="Core" Type="1">VGhpcyBvcGVyYXRpb24gaXMgbm90IGFsbG93ZWQh</PHRASE>
 			<PHRASE Label="la_error_ParsingError" Module="Core" Type="1">VmFsaWRhdGlvbiBlcnJvciwgcGxlYXNlIGRvdWJsZS1jaGVjayBJbi1Qb3J0YWwgdGFncw==</PHRASE>
 			<PHRASE Label="la_error_PasswordMatch" Module="Core" Type="1">UGFzc3dvcmRzIGRvIG5vdCBtYXRjaCE=</PHRASE>
 			<PHRASE Label="la_error_required" Module="Core" Type="1">UmVxdWlyZWQgZmllbGQoLXMpIG5vdCBmaWxsZWQ=</PHRASE>
 			<PHRASE Label="la_error_RequiredColumnsMissing" Module="Core" Type="1">cmVxdWlyZWQgY29sdW1ucyBtaXNzaW5n</PHRASE>
 			<PHRASE Label="la_error_RootCategoriesDelete" Module="Core" Type="1">Um9vdCBzZWN0aW9uIG9mIHRoZSBtb2R1bGUocykgY2FuIG5vdCBiZSBkZWxldGVkIQ==</PHRASE>
+			<PHRASE Label="la_error_SelectItemToMove" Module="Core" Type="1">U2VsZWN0IGF0IGxlYXN0IG9uZSBpdGVtIHRvIG1vdmU=</PHRASE>
+			<PHRASE Label="la_error_TemplateFileMissing" Module="Core" Type="1">VGVtcGxhdGUgZmlsZSBpcyBtaXNzaW5n</PHRASE>
+			<PHRASE Label="la_error_TemporaryTableCopyingFailed" Module="Core" Type="1">Q29weWluZyBvcGVyYXRpb24gaW4gVGVtcG9yYXJ5IHRhYmxlcyBoYXMgZmFpbGVkLiBQbGVhc2UgY29udGFjdCB3ZWJzaXRlIGFkbWluaXN0cmF0b3Iu</PHRASE>
 			<PHRASE Label="la_error_unique" Module="Core" Type="1">UmVjb3JkIGlzIG5vdCB1bmlxdWU=</PHRASE>
 			<PHRASE Label="la_error_unique_category_field" Module="Core" Type="1">U2VjdGlvbiBmaWVsZCBub3QgdW5pcXVl</PHRASE>
 			<PHRASE Label="la_error_unknown_category" Module="Core" Type="1">VW5rbm93biBzZWN0aW9u</PHRASE>
@@ -809,6 +823,7 @@
 			<PHRASE Label="la_opt_GuestsOnly" Module="Core" Type="1">R3Vlc3RzIE9ubHk=</PHRASE>
 			<PHRASE Label="la_opt_hour" Module="Core" Type="1">aG91cihzKQ==</PHRASE>
 			<PHRASE Label="la_opt_InheritFromParent" Module="Core" Type="1">SW5oZXJpdCBmcm9tIFBhcmVudA==</PHRASE>
+			<PHRASE Label="la_opt_Invalid" Module="Core" Type="1">SW52YWxpZA==</PHRASE>
 			<PHRASE Label="la_opt_IP_Address" Module="Core" Type="1">SVAgQWRkcmVzcw==</PHRASE>
 			<PHRASE Label="la_opt_IsUnique" Module="Core" Type="1">SXMgdW5pcXVl</PHRASE>
 			<PHRASE Label="la_opt_LastName" Module="Core" Type="1">TGFzdCBOYW1l</PHRASE>
@@ -822,6 +837,7 @@
 			<PHRASE Label="la_opt_NotProcessed" Module="Core" Type="1">Tm90IFByb2Nlc3NlZA==</PHRASE>
 			<PHRASE Label="la_opt_NotReplied" Module="Core" Type="1">Tm90IFJlcGxpZWQ=</PHRASE>
 			<PHRASE Label="la_opt_PartiallyProcessed" Module="Core" Type="1">UGFydGlhbGx5IFByb2Nlc3NlZA==</PHRASE>
+			<PHRASE Label="la_opt_Pending" Module="Core" Type="1">UGVuZGluZw==</PHRASE>
 			<PHRASE Label="la_opt_Phone" Module="Core" Type="1">UGhvbmU=</PHRASE>
 			<PHRASE Label="la_opt_PopupWindow" Module="Core" Type="1">UG9wdXAgV2luZG93</PHRASE>
 			<PHRASE Label="la_opt_Processed" Module="Core" Type="1">UHJvY2Vzc2Vk</PHRASE>
@@ -1045,6 +1061,7 @@
 			<PHRASE Label="la_section_General" Module="Core" Type="1">R2VuZXJhbA==</PHRASE>
 			<PHRASE Label="la_section_Image" Module="Core" Type="1">SW1hZ2U=</PHRASE>
 			<PHRASE Label="la_section_ImageSettings" Module="Core" Type="1">SW1hZ2UgU2V0dGluZ3M=</PHRASE>
+			<PHRASE Label="la_section_ImportCompleted" Module="Core" Type="1">SW1wb3J0IENvbXBsZXRlZA==</PHRASE>
 			<PHRASE Label="la_section_Items" Module="Core" Type="1">VXNlciBJdGVtcw==</PHRASE>
 			<PHRASE Label="la_section_MemoryCache" Module="Core" Type="1">TWVtb3J5IENhY2hl</PHRASE>
 			<PHRASE Label="la_section_Message" Module="Core" Type="1">TWVzc2FnZQ==</PHRASE>
@@ -1192,10 +1209,12 @@
 			<PHRASE Label="la_text_disclaimer_part2" Module="Core" Type="1">UGxlYXNlIG1ha2Ugc3VyZSB0byBCQUNLVVAgeW91ciBkYXRhYmFzZShzKSBiZWZvcmUgcnVubmluZyB0aGlzIHV0aWxpdHkh</PHRASE>
 			<PHRASE Label="la_Text_Edit" Module="Core" Type="1">RWRpdA==</PHRASE>
 			<PHRASE Label="la_Text_Email" Module="Core" Type="1">RW1haWw=</PHRASE>
+			<PHRASE Label="la_text_FollowingLinesWereNotImported" Module="Core" Type="1">Rm9sbG93aW5nIGxpbmVzIHdlcmUgTk9UIGltcG9ydGVk</PHRASE>
 			<PHRASE Label="la_Text_FrontOnly" Module="Core" Type="1">RnJvbnQtRW5kIE9ubHk=</PHRASE>
 			<PHRASE Label="la_Text_General" Module="Core" Type="1">R2VuZXJhbA==</PHRASE>
 			<PHRASE Label="la_Text_Hot" Module="Core" Type="1">SG90</PHRASE>
 			<PHRASE Label="la_Text_IAgree" Module="Core" Type="1">SSBhZ3JlZSB0byB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnM=</PHRASE>
+			<PHRASE Label="la_text_ImportResults" Module="Core" Type="1">SW1wb3J0IFJlc3VsdHM=</PHRASE>
 			<PHRASE Label="la_Text_InDevelopment" Module="Core" Type="1">SW4gRGV2ZWxvcG1lbnQ=</PHRASE>
 			<PHRASE Label="la_Text_Invalid" Module="Core" Type="2">SW52YWxpZA==</PHRASE>
 			<PHRASE Label="la_Text_Invert" Module="Core" Type="1">SW52ZXJ0</PHRASE>
@@ -1215,6 +1234,8 @@
 			<PHRASE Label="la_Text_Pop" Module="Core" Type="1">UG9wdWxhcg==</PHRASE>
 			<PHRASE Label="la_text_popularity" Module="Core" Type="1">UG9wdWxhcml0eQ==</PHRASE>
 			<PHRASE Label="la_text_ready_to_install" Module="Core" Type="1">UmVhZHkgdG8gSW5zdGFsbA==</PHRASE>
+			<PHRASE Label="la_text_RecordsAdded" Module="Core" Type="1">cmVjb3JkcyBhZGRlZA==</PHRASE>
+			<PHRASE Label="la_text_RecordsUpdated" Module="Core" Type="1">cmVjb3JkcyB1cGRhdGVk</PHRASE>
 			<PHRASE Label="la_text_RequiredFields" Module="Core" Type="1">UmVxdWlyZWQgZmllbGRz</PHRASE>
 			<PHRASE Label="la_Text_Restore_Heading" Module="Core" Type="1">SGVyZSB5b3UgY2FuIHJlc3RvcmUgeW91ciBkYXRhYmFzZSBmcm9tIGEgcHJldmlvdXNseSBiYWNrZWQgdXAgc25hcHNob3QuIFJlc3RvcmluZyB5b3VyIGRhdGFiYXNlIHdpbGwgZGVsZXRlIGFsbCBvZiB5b3VyIGN1cnJlbnQgZGF0YSBhbmQgbG9nIHlvdSBvdXQgb2YgdGhlIHN5c3RlbS4=</PHRASE>
 			<PHRASE Label="la_Text_Restrictions" Module="Core" Type="1">UmVzdHJpY3Rpb25z</PHRASE>
@@ -1277,6 +1298,7 @@
 			<PHRASE Label="la_Title_ContactInformation" Module="Core" Type="1">Q29udGFjdCBJbmZvcm1hdGlvbg==</PHRASE>
 			<PHRASE Label="la_title_CountryStates" Module="Core" Type="1">Q291bnRyaWVzICYgU3RhdGVz</PHRASE>
 			<PHRASE Label="la_title_CSVExport" Module="Core" Type="1">Q1NWIEV4cG9ydA==</PHRASE>
+			<PHRASE Label="la_title_CSVImport" Module="Core" Type="1">Q1NWIEltcG9ydA==</PHRASE>
 			<PHRASE Label="la_title_Custom" Module="Core" Type="1">Q3VzdG9t</PHRASE>
 			<PHRASE Label="la_title_CustomFields" Module="Core" Type="1">Q3VzdG9tIEZpZWxkcw==</PHRASE>
 			<PHRASE Label="la_title_EditingAgent" Module="Core" Type="1">RWRpdGluZyBBZ2VudA==</PHRASE>
Index: branches/5.1.x/core/kernel/utility/temp_handler.php
===================================================================
diff -u -N -r13750 -r14161
--- branches/5.1.x/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 13750)
+++ branches/5.1.x/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: temp_handler.php 13750 2010-06-09 20:01:41Z alex $
+* @version	$Id: temp_handler.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -850,7 +850,7 @@
 
 		if ($sleep_count > 30) {
 			// another coping process failed to finished in 30 seconds
-			$error_message = $this->Application->Phrase('la_error_TemporaryTableCopingFailed');
+			$error_message = $this->Application->Phrase('la_error_TemporaryTableCopyingFailed');
 			$this->Application->SetVar('_temp_table_message', $error_message);
 
 			return false;
Index: branches/5.1.x/core/install/install_data.sql
===================================================================
diff -u -N -r13956 -r14161
--- branches/5.1.x/core/install/install_data.sql	(.../install_data.sql)	(revision 13956)
+++ branches/5.1.x/core/install/install_data.sql	(.../install_data.sql)	(revision 14161)
@@ -482,20 +482,20 @@
 (307, 2, 225, 'AK', NULL),
 (306, 2, 225, 'AL', NULL);
 
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.VIEW', 'la_PermName_Category.View_desc', 'la_PermName_Category.View_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'la_PermName_Category.Add_desc', 'la_PermName_Category.Add_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'la_PermName_Category.Delete_desc', 'la_PermName_Category.Delete_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'la_PermName_Category.AddPending_desc', 'la_PermName_Category.AddPending_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'la_PermName_Category.Modify_desc', 'la_PermName_Category.Modify_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'la_PermName_Admin_desc', 'la_PermName_Admin_error', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'la_PermName_Login_desc', 'la_PermName_Admin_error', 'Front');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'la_PermName_Debug.Item_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'la_PermName_Debug.List_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'la_PermName_Debug.Info_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'la_PermName_Profile.Modify_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'la_PermName_ShowLang_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'la_PermName_favorites_desc', 'la_PermName_favorites_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'la_PermName_SystemAccess.ReadOnly_error', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.VIEW', 'la_PermName_Category.View_desc', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'la_PermName_Category.Add_desc', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'la_PermName_Category.Delete_desc', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'la_PermName_Category.AddPending_desc', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'la_PermName_Category.Modify_desc', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'la_PermName_Admin_desc', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'la_PermName_Login_desc', 'Front');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'la_PermName_Debug.Item_desc', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'la_PermName_Debug.List_desc', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'la_PermName_Debug.Info_desc', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'la_PermName_Profile.Modify_desc', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'la_PermName_ShowLang_desc', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'la_PermName_favorites_desc', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'Admin');
 INSERT INTO PermCache VALUES (DEFAULT, 0, 1, '11,12,13,14,15');
 
 
Index: branches/5.1.x/core/units/logs/change_logs/change_logs_config.php
===================================================================
diff -u -N -r13962 -r14161
--- branches/5.1.x/core/units/logs/change_logs/change_logs_config.php	(.../change_logs_config.php)	(revision 13962)
+++ branches/5.1.x/core/units/logs/change_logs/change_logs_config.php	(.../change_logs_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: change_logs_config.php 13962 2010-09-25 18:38:45Z alex $
+* @version	$Id: change_logs_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -40,8 +40,7 @@
 		'TableName' => TABLE_PREFIX.'ChangeLogs',
 
 		'TitlePresets' => Array (
-			'default' => Array (
-				'new_status_labels' => Array ('change-log' => '!la_title_AddingChangeLog!'),
+			'default' => Array (				
 				'edit_status_labels' => Array ('change-log' => '!la_title_EditingChangeLog!'),
 			),
 
Index: branches/5.1.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r14027 -r14161
--- branches/5.1.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 14027)
+++ branches/5.1.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 14027 2010-11-01 20:13:39Z alex $
+* @version	$Id: categories_event_handler.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1599,7 +1599,7 @@
 				// only administrator can set/change "cust_RssSource" field
 
 				if ($object->GetDBField('cust_RssSource') != $object->GetOriginalField('cust_RssSource')) {
-					$object->SetError('cust_RssSource', 'not_allowed', 'la_error_NotAllowed');
+					$object->SetError('cust_RssSource', 'not_allowed', 'la_error_OperationNotAllowed');
 				}
 			}
 		}
Index: branches/5.1.x/core/units/languages/languages_config.php
===================================================================
diff -u -N -r14155 -r14161
--- branches/5.1.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 14155)
+++ branches/5.1.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_config.php 14155 2011-01-11 10:04:17Z alex $
+* @version	$Id: languages_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -83,12 +83,7 @@
 		),
 		'events_list' => Array (
 			'prefixes' => Array ('lang', 'emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!",
-		),
-		'event_edit' => Array (
-			'prefixes' => Array ('emailevents'),
-			'edit_status_labels' => Array ('emailevents' => '!la_title_Editing_EmailEvent!'),
-			'format' => '#emailevents_status# - #emailevents_titlefield#',
-		),
+		),	
 		'email_messages_edit' => Array (
 			'prefixes' => Array ('lang', 'emailevents'),
 			'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailevents_titlefield#'",
Index: branches/5.1.x/core/admin_templates/skins/skin_list.tpl
===================================================================
diff -u -N -r13545 -r14161
--- branches/5.1.x/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 13545)
+++ branches/5.1.x/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 14161)
@@ -12,7 +12,7 @@
 	  					<script type="text/javascript">
 								a_toolbar = new ToolBar();
 
-								a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewSkin" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+								a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_Add" escape="1"/>',
 										function() {
 											std_precreate_item('skin', 'skins/skin_edit')
 										}
Index: branches/5.1.x/core/units/content/content_config.php
===================================================================
diff -u -N -r13159 -r14161
--- branches/5.1.x/core/units/content/content_config.php	(.../content_config.php)	(revision 13159)
+++ branches/5.1.x/core/units/content/content_config.php	(.../content_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: content_config.php 13159 2010-02-24 10:45:00Z alex $
+* @version	$Id: content_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -36,10 +36,8 @@
 		'AutoDelete' => true,
 		'AutoClone' => true,
 
-		'TitleField' => 'ContentNum',		// field, used in bluebar when editing existing item
-		'ViewMenuPhrase' => 'la_text_Pages',
-		'TitlePhrase' => 'la_text_PageContent',
-
+		'TitleField' => 'ContentNum',		// field, used in bluebar when editing existing item		
+		
 		'TitlePresets' => Array (
 			'default' => Array (
 				'new_status_labels' => Array ('content' => '!la_title_Adding_Content!'),
Index: branches/5.1.x/core/install/upgrades.sql
===================================================================
diff -u -N -r14109 -r14161
--- branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14109)
+++ branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14161)
@@ -1997,4 +1997,5 @@
 
 # ===== v 5.1.2-B1 =====
 DROP TABLE EmailSubscribers;
-DROP TABLE IgnoreKeywords;
\ No newline at end of file
+DROP TABLE IgnoreKeywords;
+ALTER TABLE PermissionConfig DROP ErrorMessage;	
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r14134 -r14161
--- branches/5.1.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 14134)
+++ branches/5.1.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 14161)
@@ -220,7 +220,7 @@
 								<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Delete{$field}'/>'));">
 							</td>
 							<td>
-								<label for="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>"><inp2:m_phrase name="la_btn_DeleteImage"/></label>
+								<label for="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>"><inp2:m_phrase name="la_btn_Delete"/></label>
 							</td>
 						</tr>
 					</table>
@@ -796,7 +796,7 @@
 
 			<script type="text/javascript">
 				<inp2:m_Param name="field"/> = new EditPickerControl('<inp2:m_Param name="field"/>', '<inp2:$prefix_InputName name="$field" />');
-				<inp2:m_Param name="field"/>.SetMessage('nothing_selected', '<inp2:m_Phrase label="la_SelectItemToMove" escape="1"/>');
+				<inp2:m_Param name="field"/>.SetMessage('nothing_selected', '<inp2:m_Phrase label="la_error_SelectItemToMove" escape="1"/>');
 			</script>
 
 		</td>
Index: branches/5.1.x/core/units/config_search/config_search_config.php
===================================================================
diff -u -N -r13545 -r14161
--- branches/5.1.x/core/units/config_search/config_search_config.php	(.../config_search_config.php)	(revision 13545)
+++ branches/5.1.x/core/units/config_search/config_search_config.php	(.../config_search_config.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: config_search_config.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: config_search_config.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -140,16 +140,5 @@
 				'ForcedSorting' => Array ('IsCustom' => 'asc'),
 				'Sorting' => Array ('DisplayOrder' => 'asc'),
 			),
-		),
-
-		'Grids'	=> Array (
-			'Default' => Array (
-				'Icons' => Array ('default' => 'icon16_item.png'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
-				'Fields' => Array (
-					'TableName' => Array ('title' => 'la_col_TableName', 'data_block' => 'grid_data_td'),
-					'FieldName' => Array ('title' => 'la_col_FieldName', 'data_block' => 'grid_data_td' ),
-					'SimpleSearch' => Array ('title' => 'la_col_SimpleSearch', 'data_block' => 'grid_data_td'),
-				),
-			),
-		),
+		),		
 	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/config/config_search_edit.tpl
===================================================================
diff -u -N -r13949 -r14161
--- branches/5.1.x/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 13949)
+++ branches/5.1.x/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 14161)
@@ -57,7 +57,7 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 
-			<inp2:m_RenderElement name="inp_id_label" prefix="confs" field="SearchConfigId" title="la_fld_SearchConfigId"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="confs" field="SearchConfigId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="confs" field="TableName" title="la_fld_TableName"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="confs" field="FieldName" title="la_fld_FieldName"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="confs" field="SimpleSearch" title="la_fld_SimpleSearch"/>
Index: branches/5.1.x/core/admin_templates/import/import_complete.tpl
===================================================================
diff -u -N -r12127 -r14161
--- branches/5.1.x/core/admin_templates/import/import_complete.tpl	(.../import_complete.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/import/import_complete.tpl	(.../import_complete.tpl)	(revision 14161)
@@ -7,18 +7,18 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_prompt_ImportCompleteMessage"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_ImportCompleted"/>
 		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td colspan="3" align="center">
-				<inp2:m_Phrase label="la_ImportComplete" />:
-				<inp2:adm_ImportData var="updated" /> <inp2:m_Phrase label="la_RecordsUpdated" />,
-				<inp2:adm_ImportData var="added" /> <inp2:m_Phrase label="la_RecordsAdded" />
+				<inp2:m_Phrase label="la_text_ImportResults" />:
+				<inp2:adm_ImportData var="updated" /> <inp2:m_Phrase label="la_text_RecordsUpdated" />,
+				<inp2:adm_ImportData var="added" /> <inp2:m_Phrase label="la_text_RecordsAdded" />
 			</td>
 		</tr>
 		<inp2:m_if check="adm_ImportData" var="not_imported_lines">
 			<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 				<td colspan="3" align="center">
-					<inp2:m_Phrase label="la_FollowingLinesWereNotImported" />:
+					<inp2:m_Phrase label="la_text_FollowingLinesWereNotImported" />:
 				</td>
 			</tr>
 			<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
Index: branches/5.1.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r14110 -r14161
--- branches/5.1.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 14110)
+++ branches/5.1.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 14161)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 14110 2011-01-05 10:46:18Z alex $
+* @version	$Id: configuration_event_handler.php 14161 2011-01-11 10:37:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -132,7 +132,7 @@
 				$can_change = $this->Application->ConfigValue('AllowAdminConsoleInterfaceChange');
 
 				if (($object->GetDBField('VariableValue') != $object->GetOriginalField('VariableValue')) && !$can_change) {
-					$object->SetError('VariableValue', 'not_allowed', 'la_error_NotAllowed');
+					$object->SetError('VariableValue', 'not_allowed', 'la_error_OperationNotAllowed');
 				}
 
 			}