Index: branches/5.0.x/core/units/structure/structure_config.php
===================================================================
diff -u -N -r12299 -r12639
--- branches/5.0.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 12639)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: structure_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: structure_config.php 12639 2009-09-29 15:17:02Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -170,7 +170,6 @@
 															'options_sql' => 'SELECT Title, FormId FROM '.TABLE_PREFIX.'Forms ORDER BY Title',
 															'option_key_field' => 'FormId', 'option_title_field' => 'Title', 'default' => 0),
 			'FormSubmittedTemplate'	=>	Array('type' => 'string', 'default' => null),
-			'Translated'		=>	Array ('type' => 'int', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => 0, 'db_type' => 'tinyint', 'index_type' => 'int'),
 			'FriendlyURL'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			'ThemeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
         ),
Index: branches/5.0.x/core/units/content/content_config.php
===================================================================
diff -u -N -r12299 -r12639
--- branches/5.0.x/core/units/content/content_config.php	(.../content_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/content/content_config.php	(.../content_config.php)	(revision 12639)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: content_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: content_config.php 12639 2009-09-29 15:17:02Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -61,7 +61,6 @@
 			'ContentNum' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'PageId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'Content' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => ''),
-			'Translated' => Array ('type' => 'int', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => 0, 'db_type' => 'tinyint', 'index_type' => 'int'),
 		),
 
 	);
Index: branches/5.0.x/core/install/install_schema.sql
===================================================================
diff -u -N -r12638 -r12639
--- branches/5.0.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 12638)
+++ branches/5.0.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 12639)
@@ -371,79 +371,74 @@
 );
 
 CREATE TABLE Category (
-  CategoryId int(11) NOT NULL auto_increment,
-  `Type` int(11) NOT NULL default '0',
-  SymLinkCategoryId int(10) unsigned default NULL,
-  ParentId int(11) NOT NULL default '0',
-  `Name` varchar(255) NOT NULL default '',
-  l1_Name varchar(255) NOT NULL default '',
-  l2_Name varchar(255) NOT NULL default '',
-  l3_Name varchar(255) NOT NULL default '',
-  l4_Name varchar(255) NOT NULL default '',
-  l5_Name varchar(255) NOT NULL default '',
-  Filename varchar(255) NOT NULL default '',
-  AutomaticFilename tinyint(3) unsigned NOT NULL default '1',
+  CategoryId int(11) NOT NULL AUTO_INCREMENT,
+  `Type` int(11) NOT NULL DEFAULT '0',
+  SymLinkCategoryId int(10) unsigned DEFAULT NULL,
+  ParentId int(11) NOT NULL DEFAULT '0',
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  l1_Name varchar(255) NOT NULL DEFAULT '',
+  l2_Name varchar(255) NOT NULL DEFAULT '',
+  l3_Name varchar(255) NOT NULL DEFAULT '',
+  l4_Name varchar(255) NOT NULL DEFAULT '',
+  l5_Name varchar(255) NOT NULL DEFAULT '',
+  Filename varchar(255) NOT NULL DEFAULT '',
+  AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1',
   Description text,
   l1_Description text,
   l2_Description text,
   l3_Description text,
   l4_Description text,
   l5_Description text,
-  CreatedOn int(11) NOT NULL default '0',
-  EditorsPick tinyint(4) NOT NULL default '0',
-  `Status` tinyint(4) NOT NULL default '2',
-  Priority int(11) NOT NULL default '0',
+  CreatedOn int(11) NOT NULL DEFAULT '0',
+  EditorsPick tinyint(4) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '2',
+  Priority int(11) NOT NULL DEFAULT '0',
   MetaKeywords text,
-  CachedDescendantCatsQty int(11) default NULL,
+  CachedDescendantCatsQty int(11) DEFAULT NULL,
   CachedNavbar text,
   l1_CachedNavbar text,
   l2_CachedNavbar text,
   l3_CachedNavbar text,
   l4_CachedNavbar text,
   l5_CachedNavbar text,
-  CreatedById int(11) NOT NULL default '0',
-  ResourceId int(11) default NULL,
+  CreatedById int(11) NOT NULL DEFAULT '0',
+  ResourceId int(11) DEFAULT NULL,
   ParentPath text,
-  TreeLeft bigint(20) NOT NULL default '0',
-  TreeRight bigint(20) NOT NULL default '0',
+  TreeLeft bigint(20) NOT NULL DEFAULT '0',
+  TreeRight bigint(20) NOT NULL DEFAULT '0',
   NamedParentPath text,
   MetaDescription text,
-  HotItem int(11) NOT NULL default '2',
-  NewItem int(11) NOT NULL default '2',
-  PopItem int(11) NOT NULL default '2',
-  Modified int(11) NOT NULL default '0',
-  ModifiedById int(11) NOT NULL default '0',
+  HotItem int(11) NOT NULL DEFAULT '2',
+  NewItem int(11) NOT NULL DEFAULT '2',
+  PopItem int(11) NOT NULL DEFAULT '2',
+  Modified int(11) NOT NULL DEFAULT '0',
+  ModifiedById int(11) NOT NULL DEFAULT '0',
   CachedTemplate varchar(255) NOT NULL,
-  Template varchar(255) NOT NULL default '#inherit#',
-  UseExternalUrl tinyint(3) unsigned NOT NULL default '0',
-  ExternalUrl varchar(255) NOT NULL default '',
-  UseMenuIconUrl tinyint(3) unsigned NOT NULL default '0',
-  MenuIconUrl varchar(255) NOT NULL default '',
-  l1_Title varchar(255) default '',
-  l2_Title varchar(255) default '',
-  l3_Title varchar(255) default '',
-  l4_Title varchar(255) default '',
-  l5_Title varchar(255) default '',
-  l1_MenuTitle varchar(255) NOT NULL default '',
-  l2_MenuTitle varchar(255) NOT NULL default '',
-  l3_MenuTitle varchar(255) NOT NULL default '',
-  l4_MenuTitle varchar(255) NOT NULL default '',
-  l5_MenuTitle varchar(255) NOT NULL default '',
+  Template varchar(255) NOT NULL DEFAULT '#inherit#',
+  UseExternalUrl tinyint(3) unsigned NOT NULL DEFAULT '0',
+  ExternalUrl varchar(255) NOT NULL DEFAULT '',
+  UseMenuIconUrl tinyint(3) unsigned NOT NULL DEFAULT '0',
+  MenuIconUrl varchar(255) NOT NULL DEFAULT '',
+  l1_Title varchar(255) DEFAULT '',
+  l2_Title varchar(255) DEFAULT '',
+  l3_Title varchar(255) DEFAULT '',
+  l4_Title varchar(255) DEFAULT '',
+  l5_Title varchar(255) DEFAULT '',
+  l1_MenuTitle varchar(255) NOT NULL DEFAULT '',
+  l2_MenuTitle varchar(255) NOT NULL DEFAULT '',
+  l3_MenuTitle varchar(255) NOT NULL DEFAULT '',
+  l4_MenuTitle varchar(255) NOT NULL DEFAULT '',
+  l5_MenuTitle varchar(255) NOT NULL DEFAULT '',
   MetaTitle text,
   IndexTools text,
-  IsIndex tinyint(1) NOT NULL default '0',
-  IsMenu tinyint(4) NOT NULL default '1',
-  IsSystem tinyint(4) NOT NULL default '0',
-  FormId int(11) default NULL,
-  FormSubmittedTemplate varchar(255) default NULL,
-  l1_Translated tinyint(4) NOT NULL default '0',
-  l2_Translated tinyint(4) NOT NULL default '0',
-  l3_Translated tinyint(4) NOT NULL default '0',
-  l4_Translated tinyint(4) NOT NULL default '0',
-  l5_Translated tinyint(4) NOT NULL default '0',
-  FriendlyURL varchar(255) NOT NULL default '',
+  IsIndex tinyint(1) NOT NULL DEFAULT '0',
+  IsMenu tinyint(4) NOT NULL DEFAULT '1',
+  IsSystem tinyint(4) NOT NULL DEFAULT '0',
+  FormId int(11) DEFAULT NULL,
+  FormSubmittedTemplate varchar(255) DEFAULT NULL,
+  FriendlyURL varchar(255) NOT NULL DEFAULT '',
   ThemeId int(10) unsigned NOT NULL,
-  PRIMARY KEY  (CategoryId),
+  PRIMARY KEY (CategoryId),
   UNIQUE KEY ResourceId (ResourceId),
   KEY ParentId (ParentId),
   KEY Modified (Modified),
@@ -467,11 +462,6 @@
   KEY CreatedOn (CreatedOn),
   KEY EditorsPick (EditorsPick),
   KEY IsIndex (IsIndex),
-  KEY l1_Translated (l1_Translated),
-  KEY l2_Translated (l2_Translated),
-  KEY l3_Translated (l3_Translated),
-  KEY l4_Translated (l4_Translated),
-  KEY l5_Translated (l5_Translated),
   KEY ThemeId (ThemeId)
 );
 
@@ -1035,20 +1025,15 @@
 );
 
 CREATE TABLE PageContent (
-  PageContentId int(11) NOT NULL auto_increment,
-  ContentNum int(11) NOT NULL default '0',
-  PageId int(11) NOT NULL default '0',
+  PageContentId int(11) NOT NULL AUTO_INCREMENT,
+  ContentNum int(11) NOT NULL DEFAULT '0',
+  PageId int(11) NOT NULL DEFAULT '0',
   l1_Content text,
   l2_Content text,
   l3_Content text,
   l4_Content text,
   l5_Content text,
-  l1_Translated tinyint(4) NOT NULL default '0',
-  l2_Translated tinyint(4) NOT NULL default '0',
-  l3_Translated tinyint(4) NOT NULL default '0',
-  l4_Translated tinyint(4) NOT NULL default '0',
-  l5_Translated tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (PageContentId),
+  PRIMARY KEY (PageContentId),
   KEY ContentNum (ContentNum,PageId)
 );
 
Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -N -r12638 -r12639
--- branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12638)
+++ branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12639)
@@ -1508,4 +1508,18 @@
 UPDATE Modules SET Loaded = 1 WHERE `Name` = 'In-Portal';
 
 # ===== v 5.0.2 =====
-ALTER TABLE PortalGroup DROP ResourceId;
\ No newline at end of file
+ALTER TABLE PortalGroup DROP ResourceId;
+
+ALTER TABLE Category
+	DROP l1_Translated,
+	DROP l2_Translated,
+	DROP l3_Translated,
+	DROP l4_Translated,
+	DROP l5_Translated;
+
+ALTER TABLE PageContent
+	DROP l1_Translated,
+	DROP l2_Translated,
+	DROP l3_Translated,
+	DROP l4_Translated,
+	DROP l5_Translated;
Index: branches/5.0.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r12571 -r12639
--- branches/5.0.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 12571)
+++ branches/5.0.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 12639)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 12571 2009-09-21 01:11:10Z dmitrya $
+* @version	$Id: categories_config.php 12639 2009-09-29 15:17:02Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -364,7 +364,6 @@
 				'default' => 0
 			),
 			'FormSubmittedTemplate'	=>	Array ('type' => 'string', 'default' => null),
-			'Translated'		=>	Array ('type' => 'int', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => 0, 'db_type' => 'tinyint', 'index_type' => 'int'),
 			'FriendlyURL'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			'ThemeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		),
Index: branches/5.0.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r12633 -r12639
--- branches/5.0.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 12633)
+++ branches/5.0.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 12639)
@@ -1022,7 +1022,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="ml_selector" prefix="" field="Translated">
+<inp2:m_DefineElement name="ml_selector" prefix="">
 	<inp2:m_if check="lang_IsMultiLanguage">
 		<td align="right" style="padding-right: 5px;">
 			<table width="100%" cellpadding="0" cellspacing="0">
@@ -1038,18 +1038,6 @@
 					</td>
 				</tr>
 				<tr>
-					<td align="right">
-						<inp2:m_if check="lang_IsPrimaryLanguage">
-							<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="1">
-							<input type="checkbox" disabled id="_cb_<inp2:{$prefix}_InputName field='$field'/>" name="_cb_<inp2:{$prefix}_InputName field='$field'/>" checked="checked"/>
-						<inp2:m_else/>
-							<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>">
-							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='$field'/>" name="_cb_<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$field'/>'));" />
-						</inp2:m_if>
-						<label for="_cb_<inp2:{$prefix}_InputName field='$field'/>"><inp2:m_Phrase label="la_Translated"/></label>
-					</td>
-				</tr>
-				<tr>
 					<td align="right" style="vertical-align: bottom; padding: 2px 0px 5px 2px;">
 						<span style="color: red">*</span>&nbsp;<span class="req-note"><inp2:m_Phrase name="la_text_RequiredFields"/></span>
 					</td>
Index: branches/5.0.x/admin/system_presets/simple/categories_c.php
===================================================================
diff -u -N -r12600 -r12639
--- branches/5.0.x/admin/system_presets/simple/categories_c.php	(.../categories_c.php)	(revision 12600)
+++ branches/5.0.x/admin/system_presets/simple/categories_c.php	(.../categories_c.php)	(revision 12639)
@@ -46,7 +46,7 @@
 		'MetaDescription', 'HotItem',*/ 'NewItem', /*'PopItem', 'Modified', 'ModifiedById', 'CachedTemplate',*/
 		'Template', /*'UseExternalUrl', 'ExternalUrl',*/ 'UseMenuIconUrl', 'MenuIconUrl', 'Title', 'MenuTitle',
 		/*'MetaTitle', 'IndexTools', 'IsIndex', 'IsMenu', 'IsSystem',*/ 'FormId', 'FormSubmittedTemplate',
-		/*'Translated', 'FriendlyURL', 'ThemeId'*/
+		/*'FriendlyURL', 'ThemeId'*/
 	);
 
 	// virtual fields to hide