Index: trunk/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r1633 -r1636
--- trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 1633)
+++ trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 1636)
@@ -524,10 +524,23 @@
 		return $value;
 	}
 	
-	function HasParam($params, $param_name)
+	/**
+	 * Checks if parameter is passed
+	 * Note: works like Tag and line simple method too
+	 *
+	 * @param Array $params
+	 * @param string $param_name
+	 * @return bool
+	 */
+	function HasParam($params, $param_name = null)
 	{
+		if( !isset($param_name) )
+		{
+			$param_name = $this->SelectParam($params, 'name');
+			$params = $this->Application->Parser->Params;	
+		}
 		$value = getArrayValue($params, $param_name);
-		return $value && ($value != '$'.$param_name);
+		return $value && ($value != '$'.$param_name);	
 	}
 	
 	function PhraseField($params)
Index: trunk/core/units/phrases/phrases_config.php
===================================================================
diff -u -N -r1563 -r1636
--- trunk/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 1563)
+++ trunk/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 1636)
@@ -106,6 +106,7 @@
 					'VirtualFields'	=> 	Array(	
 												'PrimaryValue'	=>	Array(),
 												'LangFile'		=>	Array(),
+												'ImportOverwrite' => Array(),
 										),
 										
 					'Grids'	=> Array(
Index: trunk/kernel/units/phrases/phrases_config.php
===================================================================
diff -u -N -r1563 -r1636
--- trunk/kernel/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 1563)
+++ trunk/kernel/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 1636)
@@ -106,6 +106,7 @@
 					'VirtualFields'	=> 	Array(	
 												'PrimaryValue'	=>	Array(),
 												'LangFile'		=>	Array(),
+												'ImportOverwrite' => Array(),
 										),
 										
 					'Grids'	=> Array(
Index: trunk/core/units/languages/import_xml.php
===================================================================
diff -u -N -r1623 -r1636
--- trunk/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 1623)
+++ trunk/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 1636)
@@ -1,5 +1,8 @@
 <?php
-
+	
+	define('LANG_OVERWRITE_EXISTING', 1);
+	define('LANG_SKIP_EXISTING', 2);
+	
 	class LangXML_Parser extends kBase {
 	
 		/**
@@ -16,13 +19,47 @@
 		 */
 		var $Conn = null;
 		
+		/**
+		 * Fields of language currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_language = Array();
+		
+		/**
+		 * Fields of phrase currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_phrase = Array();
+		
+		/**
+		 * Fields of event currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_event = Array();
 		
+		/**
+		 * Event type + name mapping to id (from system)
+		 *
+		 * @var Array
+		 */
 		var $events_hash = Array();
 		
+		
+		/**
+		 * Phrase types allowed for import/export operations
+		 *
+		 * @var Array
+		 */
 		var $phrase_types_allowed = Array();
+		
+		/**
+		 * Modules allowed for export (import in development)
+		 *
+		 * @var Array
+		 */
 		var $modules_allowed = Array();
 		
 		var $lang_object = null;
@@ -31,6 +68,8 @@
 		
 		var $ip_address = '';
 		
+		var $import_mode = LANG_SKIP_EXISTING;
+		
 		function LangXML_Parser()
 		{
 			parent::kBase();
@@ -74,12 +113,13 @@
 			return $temp_table;
 		}
 		
-		function Parse($filename, $phrase_types, $module_ids)
+		function Parse($filename, $phrase_types, $module_ids, $import_mode = LANG_SKIP_EXISTING)
 		{		
 			// define the XML parsing routines/functions to call based on the handler path
 			if( !file_exists($filename) ) return false;
 			
 			$this->phrase_types_allowed = array_flip($phrase_types);
+			$this->import_mode = $import_mode;
 			
 			//if (in_array('In-Portal',)
 			
@@ -106,6 +146,14 @@
 			{
 				case 'LANGUAGES LANGUAGE':
 					$this->current_language = Array('PackName' => $attributes['PACKNAME'], 'LocalName' => $attributes['PACKNAME']);
+					
+					$sql = 'SELECT %s FROM %s WHERE PackName = %s';
+					$sql = sprintf(	$sql,
+									$this->lang_object->IDField,
+									kTempTablesHandler::GetLiveName($this->lang_object->TableName),
+									$this->Conn->qstr($this->current_event['PackName']) );
+					$language_id = $this->Conn->GetOne($sql);
+					if($language_id) $this->current_language['LanguageId'] = $language_id;
 					break;
 					
 				case 'LANGUAGES LANGUAGE PHRASES':
Index: trunk/kernel/admin_templates/dummy.tpl
===================================================================
diff -u -N -r1566 -r1636
--- trunk/kernel/admin_templates/dummy.tpl	(.../dummy.tpl)	(revision 1566)
+++ trunk/kernel/admin_templates/dummy.tpl	(.../dummy.tpl)	(revision 1636)
@@ -1 +1 @@
-kruta
\ No newline at end of file
+ 
\ No newline at end of file
Index: trunk/kernel/units/languages/import_xml.php
===================================================================
diff -u -N -r1623 -r1636
--- trunk/kernel/units/languages/import_xml.php	(.../import_xml.php)	(revision 1623)
+++ trunk/kernel/units/languages/import_xml.php	(.../import_xml.php)	(revision 1636)
@@ -1,5 +1,8 @@
 <?php
-
+	
+	define('LANG_OVERWRITE_EXISTING', 1);
+	define('LANG_SKIP_EXISTING', 2);
+	
 	class LangXML_Parser extends kBase {
 	
 		/**
@@ -16,13 +19,47 @@
 		 */
 		var $Conn = null;
 		
+		/**
+		 * Fields of language currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_language = Array();
+		
+		/**
+		 * Fields of phrase currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_phrase = Array();
+		
+		/**
+		 * Fields of event currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_event = Array();
 		
+		/**
+		 * Event type + name mapping to id (from system)
+		 *
+		 * @var Array
+		 */
 		var $events_hash = Array();
 		
+		
+		/**
+		 * Phrase types allowed for import/export operations
+		 *
+		 * @var Array
+		 */
 		var $phrase_types_allowed = Array();
+		
+		/**
+		 * Modules allowed for export (import in development)
+		 *
+		 * @var Array
+		 */
 		var $modules_allowed = Array();
 		
 		var $lang_object = null;
@@ -31,6 +68,8 @@
 		
 		var $ip_address = '';
 		
+		var $import_mode = LANG_SKIP_EXISTING;
+		
 		function LangXML_Parser()
 		{
 			parent::kBase();
@@ -74,12 +113,13 @@
 			return $temp_table;
 		}
 		
-		function Parse($filename, $phrase_types, $module_ids)
+		function Parse($filename, $phrase_types, $module_ids, $import_mode = LANG_SKIP_EXISTING)
 		{		
 			// define the XML parsing routines/functions to call based on the handler path
 			if( !file_exists($filename) ) return false;
 			
 			$this->phrase_types_allowed = array_flip($phrase_types);
+			$this->import_mode = $import_mode;
 			
 			//if (in_array('In-Portal',)
 			
@@ -106,6 +146,14 @@
 			{
 				case 'LANGUAGES LANGUAGE':
 					$this->current_language = Array('PackName' => $attributes['PACKNAME'], 'LocalName' => $attributes['PACKNAME']);
+					
+					$sql = 'SELECT %s FROM %s WHERE PackName = %s';
+					$sql = sprintf(	$sql,
+									$this->lang_object->IDField,
+									kTempTablesHandler::GetLiveName($this->lang_object->TableName),
+									$this->Conn->qstr($this->current_event['PackName']) );
+					$language_id = $this->Conn->GetOne($sql);
+					if($language_id) $this->current_language['LanguageId'] = $language_id;
 					break;
 					
 				case 'LANGUAGES LANGUAGE PHRASES':
Index: trunk/kernel/admin_templates/regional/languages_import.tpl
===================================================================
diff -u -N -r1563 -r1636
--- trunk/kernel/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 1563)
+++ trunk/kernel/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 1636)
@@ -44,6 +44,8 @@
 	
 	<inp2:m_ParseBlock name="inp_edit_checkboxes" use_phrases="1" prefix="phrases.import" field="PhraseType" title="!la_fld_InstallPhraseTypes!"/>
 	
+	<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="phrases.import" field="ImportOverwrite" hint_label="la_importlang_phrasewarning" title="la_prompt_overwritephrases"/>
+	
 	<!--inp2:m_ParseBlock name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="!la_fld_InstallModules!"-->
 </table>	
 
Index: trunk/core/admin_templates/dummy.tpl
===================================================================
diff -u -N -r1566 -r1636
--- trunk/core/admin_templates/dummy.tpl	(.../dummy.tpl)	(revision 1566)
+++ trunk/core/admin_templates/dummy.tpl	(.../dummy.tpl)	(revision 1636)
@@ -1 +1 @@
-kruta
\ No newline at end of file
+ 
\ No newline at end of file
Index: trunk/kernel/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r1580 -r1636
--- trunk/kernel/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 1580)
+++ trunk/kernel/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 1636)
@@ -154,8 +154,7 @@
 				$lang_xml->Parse($field_values['LangFile']['tmp_name'], $field_values['PhraseType'], $field_values['Module']);
 			}
 			$event->redirect = 'dummy';
-			$event->SetRedirectParam('lang_event', 'OnImportProgress');
-			$event->SetRedirectParam('pass', 'all,lang');
+			$event->SetRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'mode'=>$field_values['ImportOverwrite']) );
 		}
 		
 		/**
@@ -168,13 +167,15 @@
 			define('IMPORT_BY', 300); // import this much records per step
 			$template_name = 'regional/languages_import_step2';
 			
+			$import_mode = (int)$this->Application->GetVar('mode'); // 1 - overwrite existing phrases, 0 - don't overwrite existing phrases
 			$import_source = (int)$this->Application->GetVar('source');
 			$import_steps = Array(0 => 'lang', 1 => 'phrases', 2 => 'emailmessages', 3 => 'finish');
 			$import_titles = Array(0 => 'la_ImportingLanguages', 1 => 'la_ImportingPhrases', 2 => 'la_ImportingEmailEvents', 3 => 'la_Done');
 			
 			// --- BEFORE ---
 			$import_prefix = $import_steps[$import_source];
 			$import_start = (int)$this->Application->GetVar('start');
+			$id_field = $this->Application->getUnitOption($import_prefix,'IDField');
 			$dst_table = $this->Application->getUnitOption($import_prefix,'TableName');
 			$src_table = kTempTablesHandler::GetTempName($dst_table);
 			
@@ -193,6 +194,7 @@
 				}
 				
 				$import_start = 0;
+				$id_field = $this->Application->getUnitOption($import_prefix,'IDField');
 				$dst_table = $this->Application->getUnitOption($import_prefix,'TableName');
 				$src_table = kTempTablesHandler::GetTempName($dst_table);
 				$import_total = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$src_table);
@@ -214,6 +216,9 @@
 			$sql = 'SELECT * FROM %s LIMIT %s,%s';
 			$rows = $this->Conn->Query( sprintf($sql,$src_table,$import_start,IMPORT_BY) );
 			
+			// if found and mode = 1 (overwrite)
+			//$search_sql = 'SELECT '.$id_field.' FROM '.$dst_table.' WHERE ';
+			
 			$fields_sql = '';
 			foreach($fields as $field_name)
 			{
@@ -236,7 +241,7 @@
 			$sql = sprintf('INSERT INTO %s (%s) VALUES %s', $dst_table, $fields_sql, $values_sql);
 			$this->Conn->Query($sql);
 			
-			$event->setRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'start' => $import_start += count($rows), 'total' => $import_total, 'source' => $import_source) );
+			$event->setRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'start' => $import_start += count($rows), 'total' => $import_total, 'source' => $import_source, 'mode' => $import_mode) );
 		}
 		
 		/**
Index: trunk/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r1580 -r1636
--- trunk/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 1580)
+++ trunk/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 1636)
@@ -154,8 +154,7 @@
 				$lang_xml->Parse($field_values['LangFile']['tmp_name'], $field_values['PhraseType'], $field_values['Module']);
 			}
 			$event->redirect = 'dummy';
-			$event->SetRedirectParam('lang_event', 'OnImportProgress');
-			$event->SetRedirectParam('pass', 'all,lang');
+			$event->SetRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'mode'=>$field_values['ImportOverwrite']) );
 		}
 		
 		/**
@@ -168,13 +167,15 @@
 			define('IMPORT_BY', 300); // import this much records per step
 			$template_name = 'regional/languages_import_step2';
 			
+			$import_mode = (int)$this->Application->GetVar('mode'); // 1 - overwrite existing phrases, 0 - don't overwrite existing phrases
 			$import_source = (int)$this->Application->GetVar('source');
 			$import_steps = Array(0 => 'lang', 1 => 'phrases', 2 => 'emailmessages', 3 => 'finish');
 			$import_titles = Array(0 => 'la_ImportingLanguages', 1 => 'la_ImportingPhrases', 2 => 'la_ImportingEmailEvents', 3 => 'la_Done');
 			
 			// --- BEFORE ---
 			$import_prefix = $import_steps[$import_source];
 			$import_start = (int)$this->Application->GetVar('start');
+			$id_field = $this->Application->getUnitOption($import_prefix,'IDField');
 			$dst_table = $this->Application->getUnitOption($import_prefix,'TableName');
 			$src_table = kTempTablesHandler::GetTempName($dst_table);
 			
@@ -193,6 +194,7 @@
 				}
 				
 				$import_start = 0;
+				$id_field = $this->Application->getUnitOption($import_prefix,'IDField');
 				$dst_table = $this->Application->getUnitOption($import_prefix,'TableName');
 				$src_table = kTempTablesHandler::GetTempName($dst_table);
 				$import_total = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$src_table);
@@ -214,6 +216,9 @@
 			$sql = 'SELECT * FROM %s LIMIT %s,%s';
 			$rows = $this->Conn->Query( sprintf($sql,$src_table,$import_start,IMPORT_BY) );
 			
+			// if found and mode = 1 (overwrite)
+			//$search_sql = 'SELECT '.$id_field.' FROM '.$dst_table.' WHERE ';
+			
 			$fields_sql = '';
 			foreach($fields as $field_name)
 			{
@@ -236,7 +241,7 @@
 			$sql = sprintf('INSERT INTO %s (%s) VALUES %s', $dst_table, $fields_sql, $values_sql);
 			$this->Conn->Query($sql);
 			
-			$event->setRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'start' => $import_start += count($rows), 'total' => $import_total, 'source' => $import_source) );
+			$event->setRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'start' => $import_start += count($rows), 'total' => $import_total, 'source' => $import_source, 'mode' => $import_mode) );
 		}
 		
 		/**
Index: trunk/kernel/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r1633 -r1636
--- trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 1633)
+++ trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 1636)
@@ -195,6 +195,7 @@
 
 <inp2:m_block name="inp_checkbox_item"/>
 	<input type="checkbox" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>[]" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;	
+	<inp2:m_if check="$prefix_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_radio"/>
@@ -213,6 +214,7 @@
 		<td>
 			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>">
 			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'))" onchange="<inp2:m_param name="onchange" />">
+			<inp2:m_if check="$prefix_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
@@ -223,9 +225,9 @@
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
-				<inp2:$prefix_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_phrase" selected="checked"/>	
+				<inp2:$prefix_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" hint_label="$hint_label" block="inp_checkbox_phrase" selected="checked"/>	
 			<inp2:m_else/>
-				<inp2:$prefix_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_item" selected="checked"/>
+				<inp2:$prefix_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" hint_label="$hint_label" block="inp_checkbox_item" selected="checked"/>
 			</inp2:m_if>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>