Index: branches/5.3.x/core/units/phrases/phrases_config.php
===================================================================
diff -u -N -r15483 -r15584
--- branches/5.3.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 15483)
+++ branches/5.3.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 15584)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_config.php 15222 2012-03-15 16:38:49Z alex $
+* @version	$Id: phrases_config.php 15584 2012-10-17 10:50:12Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -55,10 +55,12 @@
 
 			'phrase_edit_single' => Array (
 				'prefixes' => Array ('phrases'), 'format' => '#phrases_status# #phrases_titlefield#',
-				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+				'toolbar_buttons' => Array ('select', 'setprimary', 'cancel', 'reset_edit', 'prev', 'next'),
 			),
 		),
 
+		'CheckSimulatniousEdit' => true,
+
 		'PermSection' => Array ('main' => 'in-portal:phrases'),
 
 		'Sections' => Array (
@@ -69,9 +71,7 @@
 				'label'			=>	'la_title_Phrases',
 				'url'			=>	Array ('t' => 'languages/phrase_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
-//				'perm_prefix'	=>	'lang',
 				'priority'		=>	4,
-//				'show_mode'		=>	smSUPER_ADMIN,
 				'type'			=>	stTREE,
 			),
 		),
@@ -91,9 +91,17 @@
 		'CalculatedFields' => Array (
 			'' => Array (
 				'PrimaryTranslation' => 'l%4$s_Translation',
+
+				'SourceTranslation' => 'l%4$s_Translation',
+				'SourceHintTranslation' => 'l%4$s_HintTranslation',
+				'SourceColumnTranslation' => 'l%4$s_ColumnTranslation',
+
 				'CurrentTranslation' => 'l%5$s_Translation',
 				'CurrentHintTranslation' => 'l%5$s_HintTranslation',
 				'CurrentColumnTranslation' => 'l%5$s_ColumnTranslation',
+
+				'TranslationInSync' => 'IF(l%5$s_TranslateFrom = 0, 1, 0)',
+				'TranslateFromLanguage' => 'l%5$s_TranslateFrom',
 			),
 		),
 
@@ -118,6 +126,11 @@
             'Translation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
             'HintTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
             'ColumnTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
+			'TranslateFrom' => Array (
+				'type' => 'int',
+				'formatter' => 'kMultiLanguage', 'db_type' => 'int', 'index_type' => 'int',
+				'not_null' => 1, 'default' => 0
+			),
             'PhraseType' => Array (
             	'type' => 'int',
             	'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1,
@@ -134,10 +147,25 @@
 
 		'VirtualFields' => Array (
 			'PrimaryTranslation' => Array ('type' => 'string', 'default' => ''),
+
+			'SourceTranslation' => Array ('type' => 'string', 'default' => ''),
+			'SourceHintTranslation' => Array ('type' => 'string', 'default' => ''),
+			'SourceColumnTranslation' => Array ('type' => 'string', 'default' => ''),
+
 			'CurrentTranslation' => Array ('type' => 'string', 'default' => ''),
 			'CurrentHintTranslation' => Array ('type' => 'string', 'default' => ''),
 			'CurrentColumnTranslation' => Array ('type' => 'string', 'default' => ''),
 
+			'TranslationInSync' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'default' => 0,
+			),
+			'TranslateFromLanguage' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter',	'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Languages ORDER BY PackName', 'option_title_field' => 'PackName', 'option_key_field' => 'LanguageId',
+				'default' => 0,
+			),
         	// for language pack import/export
 			'LangFile' => Array (
             	'type' => 'string',
@@ -147,13 +175,14 @@
 			),
 			'ImportOverwrite' => Array (
 				'type' => 'int',
-				'formatter' => 'kOptionsFormatter',
-				'options' => Array(
-					0 => 'la_No',
-					1 => 'la_Yes',
-				),
-				'use_phrases' => 1, 'default' => 0,
+				'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'default' => 0,
 			),
+			'ImportSynced' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'default' => 1,
+			),
 			'DoNotEncode' => Array (
 				'type' => 'int',
 				'formatter' => 'kOptionsFormatter',
@@ -205,11 +234,13 @@
 					'PhraseId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
 					'Phrase' => Array ('title' => 'la_col_Label', 'filter_block' => 'grid_like_filter', 'width' => 170),
 					'CurrentTranslation' => Array ('title' => 'column:la_fld_Phrase', 'filter_block' => 'grid_like_filter', 'width' => 180),
+					'CurrentHintTranslation' => Array ('title' => 'la_col_HintPhrase', 'filter_block' => 'grid_like_filter', 'width' => 200, 'hidden' => 1),
+					'CurrentColumnTranslation' => Array ('title' => 'la_col_ColumnPhrase', 'filter_block' => 'grid_like_filter', 'width' => 200, 'hidden' => 1),
 					'PhraseType' => Array ('title' => 'column:la_fld_Location', 'filter_block' => 'grid_multioptions_filter', 'width' => 80),
 					'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145),
 					'Module' => Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100),
-					'CurrentHintTranslation' => Array ('title' => 'la_col_HintPhrase', 'width' => 200, 'hidden' => 1),
-					'CurrentColumnTranslation' => Array ('title' => 'la_col_ColumnPhrase', 'width' => 200, 'hidden' => 1),
+					'TranslationInSync' => Array ('filter_block'  => 'grid_options_filter', 'width' => 100, 'hidden' => 1),
+					'TranslateFromLanguage' => Array ('filter_block'  => 'grid_multioptions_filter', 'width' => 100, 'hidden' => 1),
 				),
 			),
 		),