Index: branches/unlabeled/unlabeled-1.61.2/admin/install/inportal_schema.sql
===================================================================
diff -u -N -r5507 -r5634
--- branches/unlabeled/unlabeled-1.61.2/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 5507)
+++ branches/unlabeled/unlabeled-1.61.2/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 5634)
@@ -39,6 +39,11 @@
   MetaKeywords varchar(255) default NULL,
   CachedDescendantCatsQty int(11) default NULL,
   CachedNavbar text NOT NULL,
+  l1_CachedNavbar text NOT NULL,
+  l2_CachedNavbar text NOT NULL,
+  l3_CachedNavbar text NOT NULL,
+  l4_CachedNavbar text NOT NULL,
+  l5_CachedNavbar text NOT NULL,
   CreatedById int(11) NOT NULL default '0',
   ResourceId int(11) default NULL,
   ParentPath text NOT NULL,
Index: branches/unlabeled/unlabeled-1.50.2/core/units/categories/categories_config.php
===================================================================
diff -u -N -r5498 -r5634
--- branches/unlabeled/unlabeled-1.50.2/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 5498)
+++ branches/unlabeled/unlabeled-1.50.2/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 5634)
@@ -238,7 +238,7 @@
 									            'Priority'					=>	Array('type' => 'int', 'not_null' => 1, 'default' => ''),
 									            'MetaKeywords'				=>	Array('type' => 'string', 'default' => ''),
 									            'CachedDescendantCatsQty'	=>	Array('type' => 'int', 'default' => ''),
-									            'CachedNavbar'				=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
+									            'CachedNavbar'				=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => ''),
 									            'CreatedById'				=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => '0'),
 									            'ResourceId'				=>	Array('type' => 'int', 'default' => ''),
 									            'ParentPath'				=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
Index: branches/unlabeled/unlabeled-1.50.2/kernel/units/categories/categories_config.php
===================================================================
diff -u -N -r5498 -r5634
--- branches/unlabeled/unlabeled-1.50.2/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 5498)
+++ branches/unlabeled/unlabeled-1.50.2/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 5634)
@@ -238,7 +238,7 @@
 									            'Priority'					=>	Array('type' => 'int', 'not_null' => 1, 'default' => ''),
 									            'MetaKeywords'				=>	Array('type' => 'string', 'default' => ''),
 									            'CachedDescendantCatsQty'	=>	Array('type' => 'int', 'default' => ''),
-									            'CachedNavbar'				=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
+									            'CachedNavbar'				=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => ''),
 									            'CreatedById'				=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => '0'),
 									            'ResourceId'				=>	Array('type' => 'int', 'default' => ''),
 									            'ParentPath'				=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
Index: branches/unlabeled/unlabeled-1.8.2/admin/install/upgrades/inportal_upgrade_v1.2.1.sql
===================================================================
diff -u -N -r5629 -r5634
--- branches/unlabeled/unlabeled-1.8.2/admin/install/upgrades/inportal_upgrade_v1.2.1.sql	(.../inportal_upgrade_v1.2.1.sql)	(revision 5629)
+++ branches/unlabeled/unlabeled-1.8.2/admin/install/upgrades/inportal_upgrade_v1.2.1.sql	(.../inportal_upgrade_v1.2.1.sql)	(revision 5634)
@@ -71,4 +71,6 @@
 INSERT INTO ConfigurationAdmin (VariableName, heading, prompt, element_type, validation, ValueList, DisplayOrder, GroupDisplayOrder, Install) VALUES ('UseOutputCompression', 'la_Text_Website', 'la_config_UseOutputCompression', 'checkbox', '', '', 10.18, 0, 1);
 INSERT INTO ConfigurationValues (VariableName, VariableValue, ModuleOwner, Section) VALUES ('UseOutputCompression', '1', 'In-Portal', 'in-portal:configure_general');
 
+ALTER TABLE Category ADD l1_CachedNavbar TEXT NOT NULL AFTER CachedNavbar, ADD l2_CachedNavbar TEXT NOT NULL AFTER l1_CachedNavbar, ADD l3_CachedNavbar TEXT NOT NULL AFTER l2_CachedNavbar, ADD l4_CachedNavbar TEXT NOT NULL AFTER l3_CachedNavbar, ADD l5_CachedNavbar TEXT NOT NULL AFTER l4_CachedNavbar;
+
 UPDATE Modules SET Version = '1.2.1' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/multilang_formatter.php
===================================================================
diff -u -N -r4950 -r5634
--- branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/multilang_formatter.php	(.../multilang_formatter.php)	(revision 4950)
+++ branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/multilang_formatter.php	(.../multilang_formatter.php)	(revision 5634)
@@ -3,9 +3,16 @@
 class kMultiLanguage extends kFormatter
 {
 
-	function LangFieldName($field_name)
+	/**
+	 * Returns ML field equivalent to field name specifed 
+	 *
+	 * @param string $field_name
+	 * @param bool $from_primary use primary/current language for name custruction
+	 * @return string
+	 */
+	function LangFieldName($field_name, $from_primary = false)
 	{
-		$lang = $this->Application->GetVar('m_lang');
+		$lang = $from_primary ? $this->Application->GetDefaultLanguageId() : $this->Application->GetVar('m_lang');
 		return 'l'.$lang.'_'.$field_name;
 	}