Index: trunk/kernel/units/languages/languages_config.php
===================================================================
diff -u -N -r1763 -r1766
--- trunk/kernel/units/languages/languages_config.php	(.../languages_config.php)	(revision 1763)
+++ trunk/kernel/units/languages/languages_config.php	(.../languages_config.php)	(revision 1766)
@@ -6,11 +6,16 @@
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'LanguagesEventHandler','file'=>'languages_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'LanguagesTagProcessor','file'=>'languages_tag_processor.php','build_event'=>'OnBuild'),
-					
 					'RegisterClasses'	=>	Array(
 												Array('pseudo'=>'LangXML','class'=>'LangXML_Parser','file'=>'import_xml.php'),
 											),
-					
+					/*'AggregateTags' => Array(
+															Array(
+																'AggregateTo' => 'm',
+																'AggregatedTagName' => 'IsMetricUnits',
+																'LocalTagName' => 'Main_IsMetricUnits',
+															),
+													),		*/			
 					'AutoLoad'			=>	true,
 					'Hooks'	=>	Array( 
 												Array(
Index: trunk/kernel/units/languages/languages_tag_processor.php
===================================================================
diff -u -N -r1566 -r1766
--- trunk/kernel/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 1566)
+++ trunk/kernel/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 1766)
@@ -56,6 +56,13 @@
 			return $ret;
 		}
 		
+/*		function Main_IsMetricUnits($params)
+		{
+			$object =& $this->Application->recallObject($this->Prefix.'.current');
+			$measure_system = $object->GetDBField('UnitSystem');
+			return $measure_system == 1 ? 1 : 0;
+		}*/
+		
 	}
 
 ?>
\ No newline at end of file
Index: trunk/core/units/languages/languages_tag_processor.php
===================================================================
diff -u -N -r1566 -r1766
--- trunk/core/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 1566)
+++ trunk/core/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 1766)
@@ -56,6 +56,13 @@
 			return $ret;
 		}
 		
+/*		function Main_IsMetricUnits($params)
+		{
+			$object =& $this->Application->recallObject($this->Prefix.'.current');
+			$measure_system = $object->GetDBField('UnitSystem');
+			return $measure_system == 1 ? 1 : 0;
+		}*/
+		
 	}
 
 ?>
\ No newline at end of file
Index: trunk/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -N -r1613 -r1766
--- trunk/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 1613)
+++ trunk/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 1766)
@@ -95,7 +95,7 @@
 			$translation = '!'.$label.'!';
 			if( $this->Application->isDebugMode() && dbg_ConstOn('DBG_PHRASES') )
 			{
-				list($edit_tpl, $index_file) = $this->Application->IsAdmin() ? Array('regional/phrases_edit', 'index4.php') : Array('organized/phrases_edit', 'index.php');
+				list($edit_tpl, $index_file) = $this->Application->IsAdmin() ? Array('regional/phrases_edit', 'index4.php') : Array('phrases_edit', 'index.php');
 				
 				$edit_url = $this->Application->HREF($edit_tpl,'',Array('m_opener'=>'d','phrases_label'=>$original_label,'phrases_event'=>'OnNew', 'pass'=>'all,phrases'), $index_file );
 				$translation = '<a href="'.$edit_url.'">!'.$label.'!</a>';
Index: trunk/kernel/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r1736 -r1766
--- trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 1736)
+++ trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 1766)
@@ -232,4 +232,23 @@
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
-<inp2:m_blockend/>
\ No newline at end of file
+<inp2:m_blockend/>
+
+<inp2:m_block name="inp_edit_weight" />
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
+		<td>
+			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
+				<input type="text" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" value="<inp2:$prefix_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
+				<inp2:m_phrase label="la_kg" />
+			</inp2:m_if>
+			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
+				<input type="text" name="<inp2:$prefix_InputName field="{$field}_a" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="{$field}_a" subfield="$subfield"/>" value="<inp2:$prefix_Field field="{$field}_a" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
+				<inp2:m_phrase label="la_lbs" />
+				<input type="text" name="<inp2:$prefix_InputName field="{$field}_b" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="{$field}_b" subfield="$subfield"/>" value="<inp2:$prefix_Field field="{$field}_b" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
+				<inp2:m_phrase label="la_oz" />
+			</inp2:m_if>			
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+	</tr>
+<inp2:m_blockend />
\ No newline at end of file
Index: trunk/core/kernel/utility/formatters.php
===================================================================
diff -u -N -r1763 -r1766
--- trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 1763)
+++ trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 1766)
@@ -908,13 +908,13 @@
 		{
 			$regional =& $this->Application->recallObject('lang.current');
 			$add_fields = Array();
-			$options =  Array('type' => 'int','error_field' => $field_name,'master_field' => $field_name,'formatter' => 'kUnitFormatter');
-			$options = array_merge_recursive2($field_options, $options);
+			$options_a =  Array('type' => 'int','error_field' => $field_name,'master_field' => $field_name,'format' => '%d');
+			$options_b =  Array('type' => 'double','error_field' => $field_name,'master_field' => $field_name,'format' => '%0.1f');
 			switch( $regional->GetDBField('UnitSystem') )
 			{
 				case 2: // US/UK
-					$add_fields[$field_name.'_a'] = $options;
-					$add_fields[$field_name.'_b'] = $options;
+					$add_fields[$field_name.'_a'] = array_merge_recursive2($field_options, $options_a);
+					$add_fields[$field_name.'_b'] = array_merge_recursive2($field_options, $options_b);
 				break;
 				default:
 			}
@@ -959,6 +959,11 @@
 		}
 	}
 	
+	function Format($value, $field_name, &$object, $format=null)
+	{
+		return parent::Format($value, $field_name, $object, $format);
+	}
+	
 /*	function Format($value, $field_name, &$object, $format=null)
 	{
 		if( isset($field_options['master_field']) )
Index: trunk/core/units/languages/languages_config.php
===================================================================
diff -u -N -r1763 -r1766
--- trunk/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 1763)
+++ trunk/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 1766)
@@ -6,11 +6,16 @@
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'LanguagesEventHandler','file'=>'languages_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'LanguagesTagProcessor','file'=>'languages_tag_processor.php','build_event'=>'OnBuild'),
-					
 					'RegisterClasses'	=>	Array(
 												Array('pseudo'=>'LangXML','class'=>'LangXML_Parser','file'=>'import_xml.php'),
 											),
-					
+					/*'AggregateTags' => Array(
+															Array(
+																'AggregateTo' => 'm',
+																'AggregatedTagName' => 'IsMetricUnits',
+																'LocalTagName' => 'Main_IsMetricUnits',
+															),
+													),		*/			
 					'AutoLoad'			=>	true,
 					'Hooks'	=>	Array( 
 												Array(