Index: branches/5.1.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r13750 -r13789
--- branches/5.1.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 13750)
+++ branches/5.1.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 13789)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 13750 2010-06-09 20:01:41Z alex $
+* @version	$Id: main_processor.php 13789 2010-06-15 21:00:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -945,12 +945,18 @@
 		}
 	}
 
+	/**
+	 * Returns Home category name
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @deprecated
+	 */
 	function RootCategoryName($params)
 	{
-		$phrase_name = $this->Application->ConfigValue('Root_Name');
 		$no_editing = array_key_exists('no_editing', $params) && $params['no_editing'];
 
-		return $this->Application->Phrase($phrase_name, !$no_editing);
+		return $this->Application->Phrase('la_rootcategory_name', !$no_editing);
 	}
 
 	/**
Index: branches/5.1.x/core/install/install_data.sql
===================================================================
diff -u -N -r13773 -r13789
--- branches/5.1.x/core/install/install_data.sql	(.../install_data.sql)	(revision 13773)
+++ branches/5.1.x/core/install/install_data.sql	(.../install_data.sql)	(revision 13789)
@@ -7,15 +7,14 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Category_Short', '3', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_category_perpage__short_prompt', 'text', '', '', 10.04, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Category_DaysNew', '8', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_category_daysnew_prompt', 'text', '', '', 10.05, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Category_ShowPick', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_category_showpick_prompt', 'checkbox', '', '', 10.06, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Root_Name', 'lu_rootcategory_name', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_prompt_root_name', 'text', '', '', 10.07, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxImportCategoryLevels', '10', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_prompt_max_import_category_levels', 'text', '', '', 10.08, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AllowDeleteRootCats', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_AllowDeleteRootCats', 'checkbox', NULL, NULL, 10.09, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Catalog_PreselectModuleTab', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.1, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'RecycleBinFolder', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_RecycleBinFolder', 'text', NULL, NULL, 10.11, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'QuickCategoryPermissionRebuild', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_QuickCategoryPermissionRebuild', 'checkbox', NULL, NULL, 10.12, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'FilenameSpecialCharReplacement', '-', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_FilenameSpecialCharReplacement', 'select', NULL, '_=+_||-=+-', 10.13, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'YahooApplicationId', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_YahooApplicationId', 'text', NULL, NULL, 10.14, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_MinKeyword_Length', '3', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_Search_MinKeyword_Length', 'text', NULL, NULL, 10.15, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxImportCategoryLevels', '10', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_prompt_max_import_category_levels', 'text', '', '', 10.07, 0, 1, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AllowDeleteRootCats', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_AllowDeleteRootCats', 'checkbox', NULL, NULL, 10.08, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Catalog_PreselectModuleTab', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.09, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'RecycleBinFolder', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_RecycleBinFolder', 'text', NULL, NULL, 10.10, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'QuickCategoryPermissionRebuild', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_QuickCategoryPermissionRebuild', 'checkbox', NULL, NULL, 10.11, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'FilenameSpecialCharReplacement', '-', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_FilenameSpecialCharReplacement', 'select', NULL, '_=+_||-=+-', 10.12, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'YahooApplicationId', '', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_YahooApplicationId', 'text', NULL, NULL, 10.13, 0, 0, NULL);
+INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_MinKeyword_Length', '3', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_Search_MinKeyword_Length', 'text', NULL, NULL, 10.14, 0, 0, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Category_MetaKey', '', 'In-Portal', 'in-portal:configure_categories', 'la_Text_MetaInfo', 'la_category_metakey', 'textarea', '', '', 20.01, 0, 1, NULL);
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Category_MetaDesc', '', 'In-Portal', 'in-portal:configure_categories', 'la_Text_MetaInfo', 'la_category_metadesc', 'textarea', '', '', 20.02, 0, 1, NULL);
 
Index: branches/5.1.x/core/units/helpers/category_helper.php
===================================================================
diff -u -N -r13561 -r13789
--- branches/5.1.x/core/units/helpers/category_helper.php	(.../category_helper.php)	(revision 13561)
+++ branches/5.1.x/core/units/helpers/category_helper.php	(.../category_helper.php)	(revision 13789)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: category_helper.php 13561 2010-05-12 12:31:09Z alex $
+* @version	$Id: category_helper.php 13789 2010-06-15 21:00:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -248,7 +248,7 @@
 			$block_params['current'] = $current_category == $block_params['cat_id'] ? 1 : 0;
 			$block_params['separator'] = $params['separator'];
 			$block_params['is_first'] = $params['is_first'];
-			$block_params['cat_name'] = $this->Application->ProcessParsedTag('m', 'RootCategoryName', $params);
+			$block_params['cat_name'] = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 			$block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,render_as');
 
 			return $this->Application->ParseBlock($block_params);
Index: branches/5.1.x/core/kernel/db/cat_tag_processor.php
===================================================================
diff -u -N -r13750 -r13789
--- branches/5.1.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 13750)
+++ branches/5.1.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 13789)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_tag_processor.php 13750 2010-06-09 20:01:41Z alex $
+* @version	$Id: cat_tag_processor.php 13789 2010-06-15 21:00:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -244,13 +244,7 @@
 			$object =& $this->getObject($params);
 			$category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId');
 
-			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%]';
-
-			if ($category_id == 0) {
-				// home category name is phrase AND phrase name is defined in configuration
-				$cache_key .= '[%PhrasesSerial%][%ConfSerial%]';
-			}
-
+			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 			$category_path = $this->Application->getCache($cache_key);
 
 			if ($category_path === false) {
@@ -260,7 +254,7 @@
 					$category_path = trim($this->CategoryName( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 				}
 				else {
-					$category_path = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+					$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				}
 
 				$this->Application->setCache($cache_key, $category_path);
Index: branches/5.1.x/core/units/permissions/permissions_tag_processor.php
===================================================================
diff -u -N -r13545 -r13789
--- branches/5.1.x/core/units/permissions/permissions_tag_processor.php	(.../permissions_tag_processor.php)	(revision 13545)
+++ branches/5.1.x/core/units/permissions/permissions_tag_processor.php	(.../permissions_tag_processor.php)	(revision 13789)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: permissions_tag_processor.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: permissions_tag_processor.php 13789 2010-06-15 21:00:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -182,13 +182,7 @@
 		function CategoryPath($params)
 		{
 			$category_id = $params['cat_id'];
-			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%]';
-
-			if ("$category_id" == '0') {
-				// home category name is phrase AND phrase name is defined in configuration
-				$cache_key .= '[%PhrasesSerial%][%ConfSerial%]';
-			}
-
+			$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 			$category_path = $this->Application->getCache($cache_key);
 
 			if ($category_path === false) {
@@ -205,7 +199,7 @@
 					$category_path = trim($this->CategoryPath( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 				}
 				else {
-					$category_path = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+					$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				}
 
 				$this->Application->setCache($cache_key, $category_path);
Index: branches/5.1.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r13756 -r13789
--- branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13756)
+++ branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13789)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 13756 2010-06-10 20:32:29Z dmitrya $
+* @version	$Id: categories_tag_processor.php 13789 2010-06-15 21:00:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -114,7 +114,7 @@
 
 		return $icon_prefix . 'section.png';
 	}
-	
+
 	function ItemCount($params)
 	{
 		$object =& $this->getObject($params);
@@ -1024,13 +1024,7 @@
 		$object =& $this->getObject($params);
 		$category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId');
 
-		$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%]';
-
-		if ($category_id == 0) {
-			// home category name is phrase AND phrase name is defined in configuration
-			$cache_key .= '[%PhrasesSerial%][%ConfSerial%]';
-		}
-
+		$cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']';
 		$category_path = $this->Application->getCache($cache_key);
 
 		if ($category_path === false) {
@@ -1062,7 +1056,7 @@
 				$category_path = trim($this->CategoryName( Array('cat_id' => 0) ).' > '.str_replace('&|&', ' > ', $cached_navbar), ' > ');
 			}
 			else {
-				$category_path = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+				$category_path = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 			}
 
 			$this->Application->setCache($cache_key, $category_path);
Index: branches/5.1.x/core/install/upgrades.sql
===================================================================
diff -u -N -r13780 -r13789
--- branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13780)
+++ branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13789)
@@ -1914,4 +1914,11 @@
 SET PhraseType = 0
 WHERE PhraseKey IN (
 	'LU_FERROR_FORGOTPW_NODATA', 'LU_FERROR_UNKNOWN_USERNAME', 'LU_FERROR_UNKNOWN_EMAIL'
-);
\ No newline at end of file
+);
+
+DELETE FROM ConfigurationValues WHERE VariableName = 'Root_Name';
+DELETE FROM Phrase WHERE PhraseKey = 'LA_PROMPT_ROOT_NAME';
+
+UPDATE ConfigurationValues
+SET DisplayOrder = DisplayOrder - 0.01
+WHERE ModuleOwner = 'In-Portal' AND `Section` = 'in-portal:configure_categories' AND DisplayOrder > 10.07;
Index: branches/5.1.x/core/units/category_items/category_items_tag_processor.php
===================================================================
diff -u -N -r13086 -r13789
--- branches/5.1.x/core/units/category_items/category_items_tag_processor.php	(.../category_items_tag_processor.php)	(revision 13086)
+++ branches/5.1.x/core/units/category_items/category_items_tag_processor.php	(.../category_items_tag_processor.php)	(revision 13789)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: category_items_tag_processor.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: category_items_tag_processor.php 13789 2010-06-15 21:00:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -23,7 +23,7 @@
 			$object =& $this->getObject($params);
 			/* @var $object kDBList */
 
-			$root_phrase = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+			$root_phrase = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 			$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $object->GetDBField($field));
 			$value = str_replace('&|&', ' > ', $cached_navbar);
 
Index: branches/5.1.x/core/units/categories/categories_item.php
===================================================================
diff -u -N -r13086 -r13789
--- branches/5.1.x/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 13086)
+++ branches/5.1.x/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 13789)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_item.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: categories_item.php 13789 2010-06-15 21:00:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -213,7 +213,7 @@
 		{
 			if ($this->IsRoot() && $this->Prefix == 'c') {
 				$title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField');
-				$category_name = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
+				$category_name = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				$this->SetDBField($title_field, $category_name);
 				return false;
 			}
Index: branches/5.1.x/core/install/english.lang
===================================================================
diff -u -N -r13773 -r13789
--- branches/5.1.x/core/install/english.lang	(.../english.lang)	(revision 13773)
+++ branches/5.1.x/core/install/english.lang	(.../english.lang)	(revision 13789)
@@ -946,7 +946,6 @@
 			<PHRASE Label="la_Prompt_Restore_Status" Module="Core" Type="1">UmVzdG9yZSBTdGF0dXM=</PHRASE>
 			<PHRASE Label="la_Prompt_Restore_Success" Module="Core" Type="1">UmVzdG9yZSBoYXMgYmVlbiBjb21wbGV0ZWQgc3VjY2Vzc2Z1bGx5</PHRASE>
 			<PHRASE Label="la_prompt_RootCategory" Module="Core" Type="1">U2VsZWN0IE1vZHVsZSBSb290IFNlY3Rpb246</PHRASE>
-			<PHRASE Label="la_prompt_root_name" Module="Core" Type="1">Um9vdCBzZWN0aW9uIG5hbWUgKGxhbmd1YWdlIHZhcmlhYmxlKQ==</PHRASE>
 			<PHRASE Label="la_prompt_root_pass" Module="Core" Type="1">Um9vdCBQYXNzd29yZA==</PHRASE>
 			<PHRASE Label="la_prompt_SearchType" Module="Core" Type="1">U2VhcmNoIFR5cGU=</PHRASE>
 			<PHRASE Label="la_prompt_Select_Source" Module="Core" Type="1">U2VsZWN0IFNvdXJjZSBMYW5ndWFnZQ==</PHRASE>
@@ -991,6 +990,7 @@
 			<PHRASE Label="la_RequiredWarning" Module="Core" Type="1">Tm90IGFsbCByZXF1aXJlZCBmaWVsZHMgYXJlIGZpbGxlZC4gUGxlYXNlIGZpbGwgdGhlbSBmaXJzdC4=</PHRASE>
 			<PHRASE Label="la_review_perpage_prompt" Module="Core" Type="1">Q29tbWVudHMgcGVyIFBhZ2U=</PHRASE>
 			<PHRASE Label="la_review_perpage_short_prompt" Module="Core" Type="1">Q29tbWVudHMgcGVyIFBhZ2UgKHNob3J0LWxpc3Qp</PHRASE>
+			<PHRASE Label="la_rootcategory_name" Module="Core" Type="1">SG9tZQ==</PHRASE>
 			<PHRASE Label="la_SampleText" Module="Core" Type="1">U2FtcGxlIFRleHQ=</PHRASE>
 			<PHRASE Label="la_SaveLogin" Module="Core" Type="1">U2F2ZSBVc2VybmFtZSBvbiBUaGlzIENvbXB1dGVy</PHRASE>
 			<PHRASE Label="la_Search" Module="Core" Type="1">U2VhcmNo</PHRASE>