Index: trunk/core/install/install_schema.sql
===================================================================
diff -u -N -r8556 -r8557
--- trunk/core/install/install_schema.sql	(.../install_schema.sql)	(revision 8556)
+++ trunk/core/install/install_schema.sql	(.../install_schema.sql)	(revision 8557)
@@ -24,6 +24,7 @@
   Type int(11) NOT NULL default '0',
   FieldName varchar(255) NOT NULL default '',
   FieldLabel varchar(40) default NULL,
+  MultiLingual TINYINT UNSIGNED NOT NULL DEFAULT '1',
   Heading varchar(60) default NULL,
   Prompt varchar(60) default NULL,
   ElementType varchar(50) NOT NULL default '',
Index: trunk/admin/install/upgrades/inportal_upgrade_v4.1.1.sql
===================================================================
diff -u -N -r8481 -r8557
--- trunk/admin/install/upgrades/inportal_upgrade_v4.1.1.sql	(.../inportal_upgrade_v4.1.1.sql)	(revision 8481)
+++ trunk/admin/install/upgrades/inportal_upgrade_v4.1.1.sql	(.../inportal_upgrade_v4.1.1.sql)	(revision 8557)
@@ -1,3 +1,4 @@
 ALTER TABLE ItemReview ADD Rating TINYINT UNSIGNED AFTER ReviewText;
+ALTER TABLE CustomField ADD MultiLingual TINYINT UNSIGNED NOT NULL DEFAULT '1' AFTER FieldLabel;
 
 UPDATE Modules SET Version = '4.1.1' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/core/install/upgrades.sql
===================================================================
diff -u -N -r8556 -r8557
--- trunk/core/install/upgrades.sql	(.../upgrades.sql)	(revision 8556)
+++ trunk/core/install/upgrades.sql	(.../upgrades.sql)	(revision 8557)
@@ -106,9 +106,10 @@
 ALTER TABLE Events ADD ReplacementTags TEXT AFTER Event;
 
 # ===== v 4.2.0 ====
-ALTER TABLE Category ADD `TreeLeft` BIGINT NOT NULL AFTER `ParentPath` ,
-ADD `TreeRight` BIGINT NOT NULL AFTER `TreeLeft` ;
+ALTER TABLE CustomField ADD MultiLingual TINYINT UNSIGNED NOT NULL DEFAULT '1' AFTER FieldLabel;
+ALTER TABLE Category
+	ADD TreeLeft BIGINT NOT NULL AFTER ParentPath ,
+	ADD TreeRight BIGINT NOT NULL AFTER TreeLeft;
 
-ALTER TABLE Category ADD INDEX ( `TreeLeft` );
-ALTER TABLE Category ADD INDEX ( `TreeRight` );
-
+ALTER TABLE Category ADD INDEX (TreeLeft);
+ALTER TABLE Category ADD INDEX (TreeRight);
Index: trunk/core/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -N -r8067 -r8557
--- trunk/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 8067)
+++ trunk/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 8557)
@@ -77,6 +77,7 @@
 										            'Type' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 										            'FieldName' => Array('required'=>'1', 'type' => 'string','not_null' => 1,'default' => ''),
 										            'FieldLabel' => Array('type' => 'string', 'required' => 1, 'default' => null),
+										            'MultiLingual' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
 										            'Heading' => Array('type' => 'string', 'required' => 1, 'default' => null),
 										            'Prompt' => Array('type' => 'string','default' => null),
 										            'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'multiselect' => 'la_type_multiselect', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_checkbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label', 'date' => 'la_type_date', 'datetime' => 'la_type_datetime')),
Index: trunk/kernel/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -N -r6669 -r8557
--- trunk/kernel/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 6669)
+++ trunk/kernel/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 8557)
@@ -21,9 +21,9 @@
 							submit_event('cf','OnCancelEdit');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('cf', '<inp2:cf_PrevId/>');
 						}
@@ -32,15 +32,15 @@
 							go_to_id('cf', '<inp2:cf_NextId/>');
 						}
 				 ) );
-				
-				
+
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="cf" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="cf" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
@@ -63,35 +63,24 @@
 <inp2:m_ParseBlock name="inp_edit_hidden" prefix="cf" field="Type" db="db"/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>	
-
-	
+	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_id_label" prefix="cf" field="CustomFieldId" title="!la_prompt_FieldId!"/>
-	
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
+		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="cf" field="MultiLingual" title="!la_fld_MultiLingual!"/>
 
-	<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
-	
-	<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
-	
-	<inp2:m_ParseBlock name="subsection" title="!la_tab_AdminUI!"/>			
-		
+	<inp2:m_ParseBlock name="subsection" title="!la_tab_AdminUI!"/>
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="!la_prompt_showgeneraltab!"/>
-		
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="Heading" title="!la_prompt_heading!" size="40"/>
-		
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-		
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" use_phrases="1"/>
-		
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/>
-		
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="DisplayOrder" title="!la_field_displayorder!" size="10"/>
-		
+
 		<inp2:m_if check="m_IsDebugMode">
 			<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="cf" field="IsSystem" title="!la_fld_IsSystem!"/>
 		</inp2:m_if>
-		
-</table>	
 
+</table>
+
 <inp2:m_include t="incs/footer"/>
-		
\ No newline at end of file
Index: trunk/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r8397 -r8557
--- trunk/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 8397)
+++ trunk/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 8557)
@@ -79,11 +79,10 @@
 	<inp2:m_if check="lang_IsNewMode">
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
-		<td class="label-cell">
+		<td  class="text">
 			<inp2:m_phrase name="la_fld_CopyLabels"/>:
 		</td>
-		<td class="control-mid">&nbsp;</td>
-		<td class="control-cell">
+		<td>
 			<input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>">
 			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))">
 
@@ -93,7 +92,7 @@
 				<inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/>
 			</select>
 		</td>
-		<td class="error-cell">&nbsp;</td>
+		<td class="error">&nbsp;</td>
 	</tr>
 	</inp2:m_if>
 </table>