Index: branches/5.2.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r14714 -r14745
--- branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 14714)
+++ branches/5.2.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 14745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 14714 2011-11-01 10:05:18Z alex $
+* @version	$Id: main_processor.php 14745 2011-11-08 09:50:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -557,7 +557,6 @@
 
 			if ( !$phrase->Load($phrase_key, 'PhraseKey') ) {
 				$phrase->SetDBField('Phrase', $phrase_name);
-				$phrase->SetDBField('PhraseType', $this->Application->isAdmin ? 1 : 0);
 
 				$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
 				/* @var $ml_helper kMultiLanguageHelper */
Index: branches/5.2.x/core/install/install_data.sql
===================================================================
diff -u -N -r14730 -r14745
--- branches/5.2.x/core/install/install_data.sql	(.../install_data.sql)	(revision 14730)
+++ branches/5.2.x/core/install/install_data.sql	(.../install_data.sql)	(revision 14745)
@@ -905,42 +905,42 @@
 (207, '0x046a', 'Yoruba (Nigeria)', 'yo-NG', '', ''),
 (208, '0x0435', 'Zulu/isiZulu (South Africa)', 'zu-ZA', 'Latn', '1252');
 
-INSERT INTO SearchConfig VALUES ('Category', 'NewItem', 0, 1, 'lu_fielddesc_category_newitem', 'lu_field_newitem', 'In-Portal', 'la_text_category', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'PopItem', 0, 1, 'lu_fielddesc_category_popitem', 'lu_field_popitem', 'In-Portal', 'la_text_category', 19, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'HotItem', 0, 1, 'lu_fielddesc_category_hotitem', 'lu_field_hotitem', 'In-Portal', 'la_text_category', 17, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'MetaDescription', 0, 1, 'lu_fielddesc_category_metadescription', 'lu_field_metadescription', 'In-Portal', 'la_text_category', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'ParentPath', 0, 1, 'lu_fielddesc_category_parentpath', 'lu_field_parentpath', 'In-Portal', 'la_text_category', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'ResourceId', 0, 1, 'lu_fielddesc_category_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_category', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'CreatedById', 0, 1, 'lu_fielddesc_category_createdbyid', 'lu_field_createdbyid', 'In-Portal', 'la_text_category', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'CachedNavbar', 0, 1, 'lu_fielddesc_category_cachednavbar', 'lu_field_cachednavbar', 'In-Portal', 'la_text_category', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'CachedDescendantCatsQty', 0, 1, 'lu_fielddesc_category_cacheddescendantcatsqty', 'lu_field_cacheddescendantcatsqty', 'In-Portal', 'la_text_category', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'MetaKeywords', 0, 1, 'lu_fielddesc_category_metakeywords', 'lu_field_metakeywords', 'In-Portal', 'la_text_category', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'Priority', 0, 1, 'lu_fielddesc_category_priority', 'lu_field_priority', 'In-Portal', 'la_text_category', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'Status', 0, 1, 'lu_fielddesc_category_status', 'lu_field_status', 'In-Portal', 'la_text_category', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'EditorsPick', 0, 1, 'lu_fielddesc_category_editorspick', 'lu_field_editorspick', 'In-Portal', 'la_text_category', 6, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'CreatedOn', 0, 1, 'lu_fielddesc_category_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_category', 5, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'Description', 1, 1, 'lu_fielddesc_category_description', 'lu_field_description', 'In-Portal', 'la_text_category', 4, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'Name', 1, 1, 'lu_fielddesc_category_name', 'lu_field_name', 'In-Portal', 'la_text_category', 3, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'ParentId', 0, 1, 'lu_fielddesc_category_parentid', 'lu_field_parentid', 'In-Portal', 'la_text_category', 2, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'CategoryId', 0, 1, 'lu_fielddesc_category_categoryid', 'lu_field_categoryid', 'In-Portal', 'la_text_category', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'Modified', 0, 1, 'lu_fielddesc_category_modified', 'lu_field_modified', 'In-Portal', 'la_text_category', 20, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('Category', 'ModifiedById', 0, 1, 'lu_fielddesc_category_modifiedbyid', 'lu_field_modifiedbyid', 'In-Portal', 'la_text_category', 21, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'NewItem', 0, 1, 'lu_fielddesc_category_newitem', 'lc_field_newitem', 'In-Portal', 'la_text_category', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'PopItem', 0, 1, 'lu_fielddesc_category_popitem', 'lc_field_popitem', 'In-Portal', 'la_text_category', 19, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'HotItem', 0, 1, 'lu_fielddesc_category_hotitem', 'lc_field_hotitem', 'In-Portal', 'la_text_category', 17, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'MetaDescription', 0, 1, 'lu_fielddesc_category_metadescription', 'lc_field_MetaDescription', 'In-Portal', 'la_text_category', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'ParentPath', 0, 1, 'lu_fielddesc_category_parentpath', 'lc_field_ParentPath', 'In-Portal', 'la_text_category', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'ResourceId', 0, 1, 'lu_fielddesc_category_resourceid', 'lc_field_resourceid', 'In-Portal', 'la_text_category', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'CreatedById', 0, 1, 'lu_fielddesc_category_createdbyid', 'lc_field_createdbyid', 'In-Portal', 'la_text_category', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'CachedNavbar', 0, 1, 'lu_fielddesc_category_cachednavbar', 'lc_field_CachedNavBar', 'In-Portal', 'la_text_category', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'CachedDescendantCatsQty', 0, 1, 'lu_fielddesc_category_cacheddescendantcatsqty', 'lc_field_CachedDescendantCatsQty', 'In-Portal', 'la_text_category', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'MetaKeywords', 0, 1, 'lu_fielddesc_category_metakeywords', 'lc_field_MetaKeywords', 'In-Portal', 'la_text_category', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'Priority', 0, 1, 'lu_fielddesc_category_priority', 'lc_field_priority', 'In-Portal', 'la_text_category', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'Status', 0, 1, 'lu_fielddesc_category_status', 'lc_field_status', 'In-Portal', 'la_text_category', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'EditorsPick', 0, 1, 'lu_fielddesc_category_editorspick', 'lc_field_EditorsPick', 'In-Portal', 'la_text_category', 6, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'CreatedOn', 0, 1, 'lu_fielddesc_category_createdon', 'lc_field_createdon', 'In-Portal', 'la_text_category', 5, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'Description', 1, 1, 'lu_fielddesc_category_description', 'lc_field_description', 'In-Portal', 'la_text_category', 4, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'Name', 1, 1, 'lu_fielddesc_category_name', 'lc_field_name', 'In-Portal', 'la_text_category', 3, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'ParentId', 0, 1, 'lu_fielddesc_category_parentid', 'lc_field_ParentId', 'In-Portal', 'la_text_category', 2, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'CategoryId', 0, 1, 'lu_fielddesc_category_categoryid', 'lc_field_CategoryId', 'In-Portal', 'la_text_category', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'Modified', 0, 1, 'lu_fielddesc_category_modified', 'lc_field_modified', 'In-Portal', 'la_text_category', 20, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Category', 'ModifiedById', 0, 1, 'lu_fielddesc_category_modifiedbyid', 'lc_field_modifiedbyid', 'In-Portal', 'la_text_category', 21, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT INTO SearchConfig VALUES ('PortalUser', 'PortalUserId', -1, 0, 'lu_fielddesc_user_portaluserid', 'lu_field_portaluserid', 'In-Portal', 'la_text_user', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'Username', -1, 0, 'lu_fielddesc_user_login', 'lu_field_login', 'In-Portal', 'la_text_user', 1, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'Password', -1, 0, 'lu_fielddesc_user_password', 'lu_field_password', 'In-Portal', 'la_text_user', 2, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'tz', -1, 0, 'lu_fielddesc_user_tz', 'lu_field_tz', 'In-Portal', 'la_text_user', 17, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'dob', -1, 0, 'lu_fielddesc_user_dob', 'lu_field_dob', 'In-Portal', 'la_text_user', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('PortalUser', 'Modified', -1, 0, 'lu_fielddesc_user_modified', 'lu_field_modified', 'In-Portal', 'la_text_user', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('PortalUser', 'Status', -1, 0, 'lu_fielddesc_user_status', 'lu_field_status', 'In-Portal', 'la_text_user', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('PortalUser', 'ResourceId', -1, 0, 'lu_fielddesc_user_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_user', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('PortalUser', 'Modified', -1, 0, 'lu_fielddesc_user_modified', 'lc_field_modified', 'In-Portal', 'la_text_user', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('PortalUser', 'Status', -1, 0, 'lu_fielddesc_user_status', 'lc_field_status', 'In-Portal', 'la_text_user', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('PortalUser', 'ResourceId', -1, 0, 'lu_fielddesc_user_resourceid', 'lc_field_resourceid', 'In-Portal', 'la_text_user', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'Country', -1, 0, 'lu_fielddesc_user_country', 'lu_field_country', 'In-Portal', 'la_text_user', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'Zip', -1, 0, 'lu_fielddesc_user_zip', 'lu_field_zip', 'In-Portal', 'la_text_user', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'State', -1, 0, 'lu_fielddesc_user_state', 'lu_field_state', 'In-Portal', 'la_text_user', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'City', -1, 0, 'lu_fielddesc_user_city', 'lu_field_city', 'In-Portal', 'la_text_user', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'Street', -1, 0, 'lu_fielddesc_user_street', 'lu_field_street', 'In-Portal', 'la_text_user', 8, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'Phone', -1, 0, 'lu_fielddesc_user_phone', 'lu_field_phone', 'In-Portal', 'la_text_user', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('PortalUser', 'CreatedOn', -1, 0, 'lu_fielddesc_user_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_user', 6, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('PortalUser', 'CreatedOn', -1, 0, 'lu_fielddesc_user_createdon', 'lc_field_createdon', 'In-Portal', 'la_text_user', 6, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'Email', -1, 0, 'lu_fielddesc_user_email', 'lu_field_email', 'In-Portal', 'la_text_user', 5, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'LastName', -1, 0, 'lu_fielddesc_user_lastname', 'lu_field_lastname', 'In-Portal', 'la_text_user', 4, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('PortalUser', 'FirstName', -1, 0, 'lu_fielddesc_user_firstname', 'lu_field_firstname', 'In-Portal', 'la_text_user', 3, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
Index: branches/5.2.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r14696 -r14745
--- branches/5.2.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 14696)
+++ branches/5.2.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 14745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_tag_processor.php 14696 2011-10-26 08:09:34Z alex $
+* @version	$Id: db_tag_processor.php 14745 2011-11-08 09:50:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1970,7 +1970,7 @@
 
 			case 'recordcount':
 				if ( $object->GetRecordsCount(false) != $object->GetRecordsCount() ) {
-					$of_phrase = $this->Application->Phrase('la_of');
+					$of_phrase = $this->Application->Phrase('lc_of');
 					return $object->GetRecordsCount() . ' ' . $of_phrase . ' ' . $object->GetRecordsCount(false);
 				}
 
Index: branches/5.2.x/core/units/phrases/phrases_config.php
===================================================================
diff -u -N -r14585 -r14745
--- branches/5.2.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 14585)
+++ branches/5.2.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 14745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_config.php 14585 2011-09-24 12:04:17Z alex $
+* @version	$Id: phrases_config.php 14745 2011-11-08 09:50:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -111,7 +111,7 @@
 			'PhraseId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
             'Phrase' => Array (
             	'type' => 'string',
-            	'formatter' => 'kFormatter', 'regexp' => '/^(la|lu)_[A-Z\d:_\-\.]+$/i', 'unique' => Array (),
+            	'formatter' => 'kFormatter', 'regexp' => '/^(la|lu|lc)_[A-Z\d:_\-\.]+$/i', 'unique' => Array (),
             	'not_null' => 1, 'required' => 1, 'default' => '',
             ),
 			'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
@@ -120,8 +120,8 @@
             'ColumnTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
             'PhraseType' => Array (
             	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1,
-            	'not_null' => 1, 'required' => 1, 'default' => 0,
+            	'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'lc_PhraseType_Both'), 'use_phrases' => 1,
+            	'not_null' => 1, 'required' => 1, 'default' => Language::PHRASE_TYPE_COMMON,
             ),
             'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 			'LastChangeIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
Index: branches/5.2.x/core/admin_templates/regional/languages_edit_phrases.tpl
===================================================================
diff -u -N -r14244 -r14745
--- branches/5.2.x/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 14745)
@@ -13,7 +13,7 @@
   				function edit()
 	  			{
   		  			Application.SetVar('regional', 1);
-	  				std_edit_temp_item('phrases', 'regional/phrases_edit');
+	  				std_edit_item('phrases', 'regional/phrases_edit');
 	  			}
 
   				a_toolbar = new ToolBar();
@@ -42,7 +42,7 @@
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewLabel" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
 						function() {
 							Application.SetVar('regional', 1);
-							std_new_item('phrases', 'regional/phrases_edit')
+							std_precreate_item('phrases', 'regional/phrases_edit')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
Index: branches/5.2.x/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r14596 -r14745
--- branches/5.2.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 14596)
+++ branches/5.2.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 14745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_event_handler.php 14596 2011-09-29 15:46:43Z alex $
+* @version	$Id: phrases_event_handler.php 14745 2011-11-08 09:50:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -115,6 +115,23 @@
 		}
 
 		/**
+		 * Sets phrase type based on place where it's created (to display on form only)
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnPreCreate(&$event)
+		{
+			parent::OnPreCreate($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$this->_setPhraseModule($object);
+		}
+
+		/**
 		 * Forces new label in case if issued from get link
 		 *
 		 * @param kEvent $event
@@ -128,23 +145,18 @@
 
 			$label = $this->Application->GetVar($event->getPrefixSpecial() . '_label');
 
-			if ($label) {
+			if ( $label ) {
 				// phrase is created in language, used to display phrases
 				$object->SetDBField('Phrase', $label);
-				$object->SetDBField('PhraseType', 1); // admin
+				$object->SetDBField('PhraseType', $this->_getPhraseType($label)); // to show on form
 				$object->SetDBField('PrimaryTranslation', $this->_getPrimaryTranslation($label));
 			}
 
-			// set module from cookie
-			$last_module = $this->Application->GetVar('last_module');
+			$this->_setPhraseModule($object);
 
-			if ($last_module) {
-				$object->SetDBField('Module', $last_module);
-			}
-
-			if (($event->Special == 'export') || ($event->Special == 'import')) {
+			if ( $event->Special == 'export' || $event->Special == 'import' ) {
 				$object->SetDBField('PhraseType', '|0|1|2|');
-				$object->SetDBField('Module', '|' . implode('|', array_keys($this->Application->ModuleInfo)) . '|' );
+				$object->SetDBField('Module', '|' . implode('|', array_keys($this->Application->ModuleInfo)) . '|');
 			}
 		}
 
@@ -153,8 +165,9 @@
 		 *
 		 * @param string $phrase
 		 * @return string
+		 * @access protected
 		 */
-		function _getPrimaryTranslation($phrase)
+		protected function _getPrimaryTranslation($phrase)
 		{
 			$sql = 'SELECT l' . $this->Application->GetDefaultLanguageId() . '_Translation
 					FROM ' . $this->Application->getUnitOption($this->Prefix, 'TableName') . '
@@ -164,6 +177,22 @@
 		}
 
 		/**
+		 * Sets new phrase module
+		 *
+		 * @param kDBItem $object
+		 * @return void
+		 * @access protected
+		 */
+		protected function _setPhraseModule(&$object)
+		{
+			$last_module = $this->Application->GetVar('last_module');
+
+			if ( $last_module ) {
+				$object->SetDBField('Module', $last_module);
+			}
+		}
+
+		/**
 		 * Forces create to use live table
 		 *
 		 * @param kEvent $event
@@ -270,7 +299,9 @@
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			$object->SetDBField('PhraseKey', mb_strtoupper($object->GetDBField('Phrase')));
+			$label = $object->GetDBField('Phrase');
+			$object->SetDBField('PhraseKey', mb_strtoupper($label));
+			$object->SetDBField('PhraseType', $this->_getPhraseType($label));
 
 			if ( $this->translationChanged($object) ) {
 				$object->SetDBField('LastChanged_date', adodb_mktime() );
@@ -282,8 +313,29 @@
 		}
 
 		/**
+		 * Returns phrase type, that corresponds given phrase label
+		 *
+		 * @param string $label
+		 * @return int
+		 * @access protected
+		 */
+		protected function _getPhraseType($label)
+		{
+			$phrase_type_map = Array (
+				'LU' => Language::PHRASE_TYPE_FRONT,
+				'LA' => Language::PHRASE_TYPE_ADMIN,
+				'LC' => Language::PHRASE_TYPE_COMMON
+			);
+
+			$label = mb_strtoupper($label);
+			$label_prefix = substr($label, 0, 2);
+
+			return isset($phrase_type_map[$label_prefix]) ? $phrase_type_map[$label_prefix] : Language::PHRASE_TYPE_COMMON;
+		}
+
+		/**
 		 * Checks, that at least one of phrase's translations was changed
-		 * 
+		 *
 		 * @param kDBItem $object
 		 * @return bool
 		 */
Index: branches/5.2.x/core/kernel/constants.php
===================================================================
diff -u -N -r14640 -r14745
--- branches/5.2.x/core/kernel/constants.php	(.../constants.php)	(revision 14640)
+++ branches/5.2.x/core/kernel/constants.php	(.../constants.php)	(revision 14745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: constants.php 14640 2011-10-05 14:18:35Z alex $
+* @version	$Id: constants.php 14745 2011-11-08 09:50:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -162,13 +162,17 @@
 		const USER = 0;
 		const ADMIN = 1;
 	}
-	
+
 	// selectors
 	define('STYLE_BASE', 1);
-	define('STYLE_BLOCK', 2);	
+	define('STYLE_BLOCK', 2);
 
 	class Language {
 		const SYNCHRONIZE_TO_OTHERS = 1;
 		const SYNCHRONIZE_FROM_OTHERS = 2;
 		const SYNCHRONIZE_DEFAULT = '|1|2|';
+
+		const PHRASE_TYPE_FRONT = 0;
+		const PHRASE_TYPE_ADMIN = 1;
+		const PHRASE_TYPE_COMMON = 2;
 	}
\ No newline at end of file
Index: branches/5.2.x/core/admin_templates/languages/phrase_edit.tpl
===================================================================
diff -u -N -r14585 -r14745
--- branches/5.2.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 14585)
+++ branches/5.2.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 14745)
@@ -91,7 +91,7 @@
 		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
 		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
 
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType"/>
+		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PhraseType"/>
 		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>
Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r14730 -r14745
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14730)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14745)
@@ -2236,4 +2236,49 @@
 SET VariableValue = IF(VariableValue = 1, 0, 1)
 WHERE VariableName = 'RegistrationUsernameRequired';
 
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'PerformExactSearch', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PerformExactSearch', 'checkbox', '', '', '10.10', 0, 0, 'la_hint_PerformExactSearch');
\ No newline at end of file
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'PerformExactSearch', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PerformExactSearch', 'checkbox', '', '', '10.10', 0, 0, 'la_hint_PerformExactSearch');
+
+
+UPDATE Phrase
+SET PhraseType = 1
+WHERE PhraseKey IN (
+	'LA_USERS_SUBSCRIBER_GROUP', 'LA_PROMPT_DUPREVIEWS', 'LA_PROMPT_DUPREVIEWS', 'LA_PROMPT_DUPRATING',
+	'LA_PROMPT_OVERWRITEPHRASES', 'LA_TEXT_BACKUP_ACCESS', 'LA_PHRASETYPE_BOTH', 'LA_TOOLTIP_NEWLISTING'
+);
+
+UPDATE Phrase
+SET PhraseType = 0
+WHERE PhraseKey IN ('LU_TITLE_SHIPPINGINFORMATION', 'LU_COMM_LASTQUATER');
+
+UPDATE Phrase
+SET Phrase = REPLACE(Phrase, 'lu_', 'la_'), PhraseKey = UPPER(Phrase)
+WHERE PhraseKey IN ('LU_OPT_AUTODETECT', 'LU_OPT_COOKIES', 'LU_OPT_QUERYSTRING');
+
+UPDATE ConfigurationValues
+SET ValueList = REPLACE(ValueList, 'lu_', 'la_')
+WHERE VariableName = 'CookieSessions';
+
+DELETE FROM Phrase WHERE PhraseKey IN ('LU_INVALID_PASSWORD', 'LA_OF', 'LU_TITLE_REVIEWPRODUCT');
+
+UPDATE Phrase
+SET PhraseType = 2
+WHERE PhraseType = 1 AND (PhraseKey LIKE 'lu_field_%' OR PhraseKey = 'LA_TEXT_VALID');
+
+UPDATE Phrase
+SET Phrase = REPLACE(Phrase, 'la_', 'lc_'), PhraseKey = UPPER(Phrase)
+WHERE PhraseType = 2;
+
+UPDATE Phrase
+SET Phrase = REPLACE(Phrase, 'lu_', 'lc_'), PhraseKey = UPPER(Phrase)
+WHERE PhraseType = 2;
+
+UPDATE SearchConfig
+SET DisplayName = REPLACE(DisplayName, 'lu_', 'lc_')
+WHERE DisplayName IN (
+	'lu_field_newitem', 'lu_field_popitem', 'lu_field_hotitem', 'lu_field_resourceid', 'lu_field_createdbyid',
+	'lu_field_priority', 'lu_field_status', 'lu_field_createdon', 'lu_field_description', 'lu_field_name',
+	'lu_field_modified', 'lu_field_modifiedbyid', 'lu_field_ParentPath', 'lu_field_ParentId', 'lu_field_MetaKeywords',
+	'lu_field_MetaDescription', 'lu_field_EditorsPick', 'lu_field_CategoryId', 'lu_field_CachedNavBar',
+	'lu_field_CachedDescendantCatsQty', 'lu_field_hits', 'lu_field_cachedrating', 'lu_field_cachedvotesqty',
+	'lu_field_cachedreviewsqty', 'lu_field_orgid'
+);
Index: branches/5.2.x/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -N -r14585 -r14745
--- branches/5.2.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 14585)
+++ branches/5.2.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 14745)
@@ -22,7 +22,7 @@
 							<inp2:m_if check="phrases_UseQuickFormCancel">
 								window_close();
 							<inp2:m_else/>
-								cancel_edit('phrases', 'OnCancel', '<inp2:phrases_SaveEvent/>', '<inp2:m_Phrase label="la_FormCancelConfirmation" js_escape="1"/>');
+								cancel_edit('phrases', 'OnCancelEdit', '<inp2:phrases_SaveEvent/>', '<inp2:m_Phrase label="la_FormCancelConfirmation" js_escape="1"/>');
 							</inp2:m_if>
 						}
 					)
@@ -84,7 +84,7 @@
 		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_HintTranslation" title="la_fld_HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
 		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_ColumnTranslation" title="la_fld_ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
 
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType"/>
+		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PhraseType"/>
 		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -N -r14730 -r14745
--- branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 14730)
+++ branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 14745)
@@ -659,7 +659,6 @@
 			<PHRASE Label="la_Hot" Module="Core" Type="1">SG90</PHRASE>
 			<PHRASE Label="la_Html" Module="Core" Type="1">SFRNTA==</PHRASE>
 			<PHRASE Label="la_IDField" Module="Core" Type="1">SUQgRmllbGQ=</PHRASE>
-			<PHRASE Label="la_importlang_phrasewarning" Module="Core" Type="2">RW5hYmxpbmcgdGhpcyBvcHRpb24gd2lsbCB1bmRvIGFueSBjaGFuZ2VzIHlvdSBoYXZlIG1hZGUgdG8gZXhpc3RpbmcgcGhyYXNlcw==</PHRASE>
 			<PHRASE Label="la_invalid_email" Module="Core" Type="1">SW52YWxpZCBFLU1haWw=</PHRASE>
 			<PHRASE Label="la_invalid_integer" Module="Core" Type="1">SW5jb3JyZWN0IGRhdGEgZm9ybWF0LCBwbGVhc2UgdXNlIGludGVnZXI=</PHRASE>
 			<PHRASE Label="la_invalid_license" Module="Core" Type="1">TWlzc2luZyBvciBpbnZhbGlkIEluLVBvcnRhbCBMaWNlbnNl</PHRASE>
@@ -715,7 +714,6 @@
 			<PHRASE Label="la_No" Module="Core" Type="1">Tm8=</PHRASE>
 			<PHRASE Label="la_none" Module="Core" Type="1">Tm9uZQ==</PHRASE>
 			<PHRASE Label="la_no_permissions" Module="Core" Type="1">Tm8gUGVybWlzc2lvbnM=</PHRASE>
-			<PHRASE Label="la_of" Module="Core" Type="1">b2Y=</PHRASE>
 			<PHRASE Label="la_Off" Module="Core" Type="1">T2Zm</PHRASE>
 			<PHRASE Label="la_On" Module="Core" Type="1">T24=</PHRASE>
 			<PHRASE Label="la_OneWay" Module="Core" Type="1">T25lIFdheQ==</PHRASE>
@@ -726,13 +724,15 @@
 			<PHRASE Label="la_opt_Address" Module="Core" Type="1">QWRkcmVzcw==</PHRASE>
 			<PHRASE Label="la_opt_After" Module="Core" Type="1">QWZ0ZXI=</PHRASE>
 			<PHRASE Label="la_opt_Allow" Module="Core" Type="1">QWxsb3c=</PHRASE>
+			<PHRASE Label="la_opt_AutoDetect" Module="Core" Type="1">QXV0by1EZXRlY3Q=</PHRASE>
 			<PHRASE Label="la_opt_Before" Module="Core" Type="1">QmVmb3Jl</PHRASE>
 			<PHRASE Label="la_opt_Bounce" Module="Core" Type="1">Qm91bmNlZA==</PHRASE>
 			<PHRASE Label="la_opt_Cancelled" Module="Core" Type="1">Q2FuY2VsZWQ=</PHRASE>
 			<PHRASE Label="la_opt_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>
 			<PHRASE Label="la_opt_Colon" Module="Core" Type="1">Q29sb24=</PHRASE>
 			<PHRASE Label="la_opt_Comma" Module="Core" Type="1">Q29tbWE=</PHRASE>
 			<PHRASE Label="la_opt_CommentText" Module="Core" Type="1">Q29tbWVudCBUZXh0</PHRASE>
+			<PHRASE Label="la_opt_Cookies" Module="Core" Type="1">Q29va2llcw==</PHRASE>
 			<PHRASE Label="la_opt_Country" Module="Core" Type="1">Q291bnRyeQ==</PHRASE>
 			<PHRASE Label="la_opt_CreatedOn" Module="Core" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
 			<PHRASE Label="la_opt_CurrentDomain" Module="Core" Type="1">Q3VycmVudCBEb21haW4=</PHRASE>
@@ -776,6 +776,7 @@
 			<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>
+			<PHRASE Label="la_opt_QueryString" Module="Core" Type="1">UXVlcnkgU3RyaW5nIChTSUQp</PHRASE>
 			<PHRASE Label="la_opt_Rating" Module="Core" Type="1">UmF0aW5n</PHRASE>
 			<PHRASE Label="la_opt_RecipientEmail" Module="Core" Type="1">UmVjaXBpZW50IEUtbWFpbA==</PHRASE>
 			<PHRASE Label="la_opt_RecipientName" Module="Core" Type="1">UmVjaXBpZW50IE5hbWU=</PHRASE>
@@ -883,8 +884,8 @@
 			<PHRASE Label="la_prompt_DisabledCategories" Module="Core" Type="1">RGlzYWJsZWQgU2VjdGlvbnM=</PHRASE>
 			<PHRASE Label="la_prompt_DisplayInGrid" Module="Core" Type="1">RGlzcGxheSBpbiBHcmlk</PHRASE>
 			<PHRASE Label="la_prompt_DisplayOrder" Module="Core" Type="1">RGlzcGxheSBPcmRlcg==</PHRASE>
-			<PHRASE Label="la_prompt_DupRating" Module="Core" Type="2">QWxsb3cgRHVwbGljYXRlIFJhdGluZyBWb3Rlcw==</PHRASE>
-			<PHRASE Label="la_prompt_DupReviews" Module="Core" Type="2">QWxsb3cgRHVwbGljYXRlIFJldmlld3M=</PHRASE>
+			<PHRASE Label="la_prompt_DupRating" Module="Core" Type="1">QWxsb3cgRHVwbGljYXRlIFJhdGluZyBWb3Rlcw==</PHRASE>
+			<PHRASE Label="la_prompt_DupReviews" Module="Core" Type="1">QWxsb3cgRHVwbGljYXRlIFJldmlld3M=</PHRASE>
 			<PHRASE Label="la_prompt_EditorsPick" Module="Core" Type="1">RWRpdG9yJ3MgUGljaw==</PHRASE>
 			<PHRASE Label="la_prompt_ElementType" Module="Core" Type="1">VHlwZQ==</PHRASE>
 			<PHRASE Label="la_prompt_EmailCompleteMessage" Module="Core" Type="1">VGhlIEVtYWlsIE1lc3NhZ2UgaGFzIGJlZW4gc2VudA==</PHRASE>
@@ -917,7 +918,7 @@
 			<PHRASE Label="la_prompt_NewestLinkDate" Module="Core" Type="1">TmV3ZXN0IExpbmsgRGF0ZQ==</PHRASE>
 			<PHRASE Label="la_prompt_NewestUserDate" Module="Core" Type="1">TmV3ZXN0IFVzZXIgRGF0ZQ==</PHRASE>
 			<PHRASE Label="la_prompt_NonExpiredSessions" Module="Core" Type="1">Q3VycmVudGx5IEFjdGl2ZSBVc2VyIFNlc3Npb25z</PHRASE>
-			<PHRASE Label="la_prompt_overwritephrases" Module="Core" Type="2">T3ZlcndyaXRlIEV4aXN0aW5nIFBocmFzZXM=</PHRASE>
+			<PHRASE Label="la_prompt_overwritephrases" Module="Core" Type="1">T3ZlcndyaXRlIEV4aXN0aW5nIFBocmFzZXM=</PHRASE>
 			<PHRASE Label="la_prompt_PendingCategories" Module="Core" Type="1">UGVuZGluZyBTZWN0aW9ucw==</PHRASE>
 			<PHRASE Label="la_prompt_PendingItems" Module="Core" Type="1">UGVuZGluZyBJdGVtcw==</PHRASE>
 			<PHRASE Label="la_prompt_perform_now" Module="Core" Type="1">UGVyZm9ybSB0aGlzIG9wZXJhdGlvbiBub3c/</PHRASE>
@@ -1127,7 +1128,7 @@
 			<PHRASE Label="la_Text_All" Module="Core" Type="1">QWxs</PHRASE>
 			<PHRASE Label="la_text_AutoRefresh" Module="Core" Type="1">QXV0by1SZWZyZXNo</PHRASE>
 			<PHRASE Label="la_Text_BackupComplete" Module="Core" Type="1">QmFjayB1cCBoYXMgYmVlbiBjb21wbGV0ZWQuIFRoZSBiYWNrdXAgZmlsZSBpczo=</PHRASE>
-			<PHRASE Label="la_Text_backup_access" Module="Core" Type="2">SW4tUG9ydGFsIGRvZXMgbm90IGhhdmUgYWNjZXNzIHRvIHdyaXRlIHRvIHRoaXMgZGlyZWN0b3J5</PHRASE>
+			<PHRASE Label="la_Text_backup_access" Module="Core" Type="1">SW4tUG9ydGFsIGRvZXMgbm90IGhhdmUgYWNjZXNzIHRvIHdyaXRlIHRvIHRoaXMgZGlyZWN0b3J5</PHRASE>
 			<PHRASE Label="la_Text_Backup_Info" Module="Core" Type="1">VGhpcyB1dGlsaXR5IGFsbG93cyB5b3UgdG8gYmFja3VwIHlvdXIgSW4tUG9ydGFsIGRhdGFiYXNlIHNvIGl0IGNhbiBiZSByZXN0b3JlZCBhdCBsYXRlciBpbiBuZWVkZWQu</PHRASE>
 			<PHRASE Label="la_text_Bytes" Module="Core" Type="1">Ynl0ZXM=</PHRASE>
 			<PHRASE Label="la_Text_Catalog" Module="Core" Type="1">Q2F0YWxvZw==</PHRASE>
@@ -1152,7 +1153,6 @@
 			<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>
 			<PHRASE Label="la_text_keyword" Module="Core" Type="1">S2V5d29yZA==</PHRASE>
 			<PHRASE Label="la_Text_Link" Module="Core" Type="1">TGluaw==</PHRASE>
@@ -1163,7 +1163,6 @@
 			<PHRASE Label="la_Text_New" Module="Core" Type="1">TmV3</PHRASE>
 			<PHRASE Label="la_Text_None" Module="Core" Type="1">Tm9uZQ==</PHRASE>
 			<PHRASE Label="la_text_NoPermission" Module="Core" Type="1">Tm8gUGVybWlzc2lvbg==</PHRASE>
-			<PHRASE Label="la_Text_Not_Validated" Module="Core" Type="2">Tm90IFZhbGlkYXRlZA==</PHRASE>
 			<PHRASE Label="la_text_Or" Module="Core" Type="1">b3I=</PHRASE>
 			<PHRASE Label="la_Text_Phone" Module="Core" Type="1">UGhvbmU=</PHRASE>
 			<PHRASE Label="la_Text_Pop" Module="Core" Type="1">UG9wdWxhcg==</PHRASE>
@@ -1473,7 +1472,7 @@
 			<PHRASE Label="la_users_new_group" Module="Core" Type="1">QXNzaWduIHJlZ2lzdGVyZWQgdXNlcnMgdG8gZ3JvdXA=</PHRASE>
 			<PHRASE Label="la_users_password_auto" Module="Core" Type="1">QXNzaWduIHBhc3N3b3JkIGF1dG9tYXRpY2FsbHk=</PHRASE>
 			<PHRASE Label="la_users_review_deny" Module="Core" Type="1">TnVtYmVyIG9mIGRheXMgdG8gZGVueSBtdWx0aXBsZSBDb21tZW50cyBmcm9tIHRoZSBzYW1lIHVzZXI=</PHRASE>
-			<PHRASE Label="la_users_subscriber_group" Module="Core" Type="2">QXNzaWduIG1haWxpbmcgbGlzdCBzdWJzY3JpYmVycyB0byBncm91cA==</PHRASE>
+			<PHRASE Label="la_users_subscriber_group" Module="Core" Type="1">QXNzaWduIG1haWxpbmcgbGlzdCBzdWJzY3JpYmVycyB0byBncm91cA==</PHRASE>
 			<PHRASE Label="la_users_votes_deny" Module="Core" Type="1">TnVtYmVyIG9mIGRheXMgdG8gZGVueSBtdWx0aXBsZSB2b3RlcyBmcm9tIHRoZSBzYW1lIHVzZXI=</PHRASE>
 			<PHRASE Label="la_US_UK" Module="Core" Type="1">VVMvVUs=</PHRASE>
 			<PHRASE Label="la_ValidationEmail" Module="Core" Type="1">RS1tYWlsIGFkZHJlc3M=</PHRASE>
@@ -1487,42 +1486,41 @@
 			<PHRASE Label="la_Windows" Module="Core" Type="1">V2luZG93cw==</PHRASE>
 			<PHRASE Label="la_year" Module="Core" Type="1">eWVhcg==</PHRASE>
 			<PHRASE Label="la_Yes" Module="Core" Type="1">WWVz</PHRASE>
-			<PHRASE Label="lu_field_CachedDescendantCatsQty" Module="Core" Type="1">U3ViLXNlY3Rpb25zIFF1YW50aXR5</PHRASE>
-			<PHRASE Label="lu_field_CachedNavBar" Module="Core" Type="1">TmF2aWdhdGlvbiBCYXI=</PHRASE>
-			<PHRASE Label="lu_field_cachedrating" Module="Core" Type="2">UmF0aW5n</PHRASE>
-			<PHRASE Label="lu_field_cachedreviewsqty" Module="Core" Type="2">TnVtYmVyIG9mIFJldmlld3M=</PHRASE>
-			<PHRASE Label="lu_field_cachedvotesqty" Module="Core" Type="2">TnVtYmVyIG9mIFJhdGluZyBWb3Rlcw==</PHRASE>
-			<PHRASE Label="lu_field_CategoryId" Module="Core" Type="1">U2VjdGlvbiBJRA==</PHRASE>
-			<PHRASE Label="lu_field_createdbyid" Module="Core" Type="2">Q3JlYXRlZCBCeSBVc2VyIElE</PHRASE>
-			<PHRASE Label="lu_field_createdon" Module="Core" Type="2">RGF0ZSBDcmVhdGVk</PHRASE>
-			<PHRASE Label="lu_field_description" Module="Core" Type="2">RGVzY3JpcHRpb24=</PHRASE>
-			<PHRASE Label="lu_field_EditorsPick" Module="Core" Type="1">RWRpdG9ycyBQaWNr</PHRASE>
-			<PHRASE Label="lu_field_hits" Module="Core" Type="2">SGl0cw==</PHRASE>
-			<PHRASE Label="lu_field_hotitem" Module="Core" Type="2">SXRlbSBJcyBIb3Q=</PHRASE>
-			<PHRASE Label="lu_field_linkid" Module="Core" Type="2">TGluayBJRA==</PHRASE>
-			<PHRASE Label="lu_field_MetaDescription" Module="Core" Type="1">TWV0YSBEZXNjcmlwdGlvbg==</PHRASE>
-			<PHRASE Label="lu_field_MetaKeywords" Module="Core" Type="1">TWV0YSBLZXl3b3Jkcw==</PHRASE>
-			<PHRASE Label="lu_field_modified" Module="Core" Type="2">TGFzdCBNb2RpZmllZCBEYXRl</PHRASE>
-			<PHRASE Label="lu_field_modifiedbyid" Module="Core" Type="2">TW9kaWZpZWQgQnkgVXNlciBJRA==</PHRASE>
-			<PHRASE Label="lu_field_name" Module="Core" Type="2">TmFtZQ==</PHRASE>
-			<PHRASE Label="lu_field_newitem" Module="Core" Type="2">SXRlbSBJcyBOZXc=</PHRASE>
-			<PHRASE Label="lu_field_notifyowneronchanges" Module="Core" Type="2">Tm90aWZ5IE93bmVyIG9mIENoYW5nZXM=</PHRASE>
-			<PHRASE Label="lu_field_orgid" Module="Core" Type="2">T3JpZ2luYWwgSXRlbSBJRA==</PHRASE>
-			<PHRASE Label="lu_field_ownerid" Module="Core" Type="2">T3duZXIgVXNlciBJRA==</PHRASE>
-			<PHRASE Label="lu_field_ParentId" Module="Core" Type="1">UGFyZW50IElE</PHRASE>
-			<PHRASE Label="lu_field_ParentPath" Module="Core" Type="1">UGFyZW50IFBhdGg=</PHRASE>
-			<PHRASE Label="lu_field_popitem" Module="Core" Type="2">SXRlbSBJcyBQb3B1bGFy</PHRASE>
-			<PHRASE Label="lu_field_priority" Module="Core" Type="2">UHJpb3JpdHk=</PHRASE>
-			<PHRASE Label="lu_field_qtysold" Module="Core" Type="1">UXR5IFNvbGQ=</PHRASE>
-			<PHRASE Label="lu_field_resourceid" Module="Core" Type="2">UmVzb3VyY2UgSUQ=</PHRASE>
-			<PHRASE Label="lu_field_status" Module="Core" Type="2">U3RhdHVz</PHRASE>
-			<PHRASE Label="lu_field_topseller" Module="Core" Type="1">SXRlbSBJcyBhIFRvcCBTZWxsZXI=</PHRASE>
-			<PHRASE Label="lu_field_url" Module="Core" Type="2">VVJM</PHRASE>
-			<PHRASE Label="lu_invalid_password" Module="Core" Type="1">SW5jb3JyZWN0IFVzZXJuYW1lIG9yIFBhc3N3b3Jk</PHRASE>
-			<PHRASE Label="lu_of" Module="Core" Type="2">b2Y=</PHRASE>
-			<PHRASE Label="lu_opt_AutoDetect" Module="Core" Type="1">QXV0by1EZXRlY3Q=</PHRASE>
-			<PHRASE Label="lu_opt_Cookies" Module="Core" Type="1">Q29va2llcw==</PHRASE>
-			<PHRASE Label="lu_opt_QueryString" Module="Core" Type="1">UXVlcnkgU3RyaW5nIChTSUQp</PHRASE>
+			<PHRASE Label="lc_field_CachedDescendantCatsQty" Module="Core" Type="2">U3ViLXNlY3Rpb25zIFF1YW50aXR5</PHRASE>
+			<PHRASE Label="lc_field_CachedNavBar" Module="Core" Type="2">TmF2aWdhdGlvbiBCYXI=</PHRASE>
+			<PHRASE Label="lc_field_cachedrating" Module="Core" Type="2">UmF0aW5n</PHRASE>
+			<PHRASE Label="lc_field_cachedreviewsqty" Module="Core" Type="2">TnVtYmVyIG9mIFJldmlld3M=</PHRASE>
+			<PHRASE Label="lc_field_cachedvotesqty" Module="Core" Type="2">TnVtYmVyIG9mIFJhdGluZyBWb3Rlcw==</PHRASE>
+			<PHRASE Label="lc_field_CategoryId" Module="Core" Type="2">U2VjdGlvbiBJRA==</PHRASE>
+			<PHRASE Label="lc_field_createdbyid" Module="Core" Type="2">Q3JlYXRlZCBCeSBVc2VyIElE</PHRASE>
+			<PHRASE Label="lc_field_createdon" Module="Core" Type="2">RGF0ZSBDcmVhdGVk</PHRASE>
+			<PHRASE Label="lc_field_description" Module="Core" Type="2">RGVzY3JpcHRpb24=</PHRASE>
+			<PHRASE Label="lc_field_EditorsPick" Module="Core" Type="2">RWRpdG9ycyBQaWNr</PHRASE>
+			<PHRASE Label="lc_field_hits" Module="Core" Type="2">SGl0cw==</PHRASE>
+			<PHRASE Label="lc_field_hotitem" Module="Core" Type="2">SXRlbSBJcyBIb3Q=</PHRASE>
+			<PHRASE Label="lc_field_linkid" Module="Core" Type="2">TGluayBJRA==</PHRASE>
+			<PHRASE Label="lc_field_MetaDescription" Module="Core" Type="2">TWV0YSBEZXNjcmlwdGlvbg==</PHRASE>
+			<PHRASE Label="lc_field_MetaKeywords" Module="Core" Type="2">TWV0YSBLZXl3b3Jkcw==</PHRASE>
+			<PHRASE Label="lc_field_modified" Module="Core" Type="2">TGFzdCBNb2RpZmllZCBEYXRl</PHRASE>
+			<PHRASE Label="lc_field_modifiedbyid" Module="Core" Type="2">TW9kaWZpZWQgQnkgVXNlciBJRA==</PHRASE>
+			<PHRASE Label="lc_field_name" Module="Core" Type="2">TmFtZQ==</PHRASE>
+			<PHRASE Label="lc_field_newitem" Module="Core" Type="2">SXRlbSBJcyBOZXc=</PHRASE>
+			<PHRASE Label="lc_field_notifyowneronchanges" Module="Core" Type="2">Tm90aWZ5IE93bmVyIG9mIENoYW5nZXM=</PHRASE>
+			<PHRASE Label="lc_field_orgid" Module="Core" Type="2">T3JpZ2luYWwgSXRlbSBJRA==</PHRASE>
+			<PHRASE Label="lc_field_ownerid" Module="Core" Type="2">T3duZXIgVXNlciBJRA==</PHRASE>
+			<PHRASE Label="lc_field_ParentId" Module="Core" Type="2">UGFyZW50IElE</PHRASE>
+			<PHRASE Label="lc_field_ParentPath" Module="Core" Type="2">UGFyZW50IFBhdGg=</PHRASE>
+			<PHRASE Label="lc_field_popitem" Module="Core" Type="2">SXRlbSBJcyBQb3B1bGFy</PHRASE>
+			<PHRASE Label="lc_field_priority" Module="Core" Type="2">UHJpb3JpdHk=</PHRASE>
+			<PHRASE Label="lc_field_qtysold" Module="Core" Type="2">UXR5IFNvbGQ=</PHRASE>
+			<PHRASE Label="lc_field_resourceid" Module="Core" Type="2">UmVzb3VyY2UgSUQ=</PHRASE>
+			<PHRASE Label="lc_field_status" Module="Core" Type="2">U3RhdHVz</PHRASE>
+			<PHRASE Label="lc_field_topseller" Module="Core" Type="2">SXRlbSBJcyBhIFRvcCBTZWxsZXI=</PHRASE>
+			<PHRASE Label="lc_field_url" Module="Core" Type="2">VVJM</PHRASE>
+			<PHRASE Label="lc_importlang_phrasewarning" Module="Core" Type="2">RW5hYmxpbmcgdGhpcyBvcHRpb24gd2lsbCB1bmRvIGFueSBjaGFuZ2VzIHlvdSBoYXZlIG1hZGUgdG8gZXhpc3RpbmcgcGhyYXNlcw==</PHRASE>
+			<PHRASE Label="lc_of" Module="Core" Type="2">b2Y=</PHRASE>
+			<PHRASE Label="lc_Text_Invalid" Module="Core" Type="2">SW52YWxpZA==</PHRASE>
+			<PHRASE Label="lc_Text_Not_Validated" Module="Core" Type="2">Tm90IFZhbGlkYXRlZA==</PHRASE>
 		</PHRASES>
 		<EVENTS>
 			<EVENT MessageType="html" Event="CATEGORY.ADD" Type="0">U3ViamVjdDogTmV3IENhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIC0gQWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIGFkZGVkLg==</EVENT>
@@ -1872,4 +1870,4 @@
 			<COUNTRY Iso="ZWE" Translation="WmltYmFid2U="/>
 		</COUNTRIES>
 	</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file
+</LANGUAGES>