Index: branches/5.3.x/core/admin_templates/languages/phrase_edit.tpl
===================================================================
diff -u -N -r15483 -r15584
--- branches/5.3.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 15483)
+++ branches/5.3.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 15584)
@@ -9,11 +9,33 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'select',
+						'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
+						function() {
+							Application.SetVar('translation_save_mode', 1);
 							submit_event('phrases','<inp2:phrases_SaveEvent/>');
 						}
-					) );
+					)
+				);
 
+				<inp2:m_if check="lang_IsMultiLanguage">
+					a_toolbar.AddButton(
+						new ToolBarButton(
+							'setprimary',
+							'<inp2:m_Phrase label="hint:la_ToolTip_SetPrimaryTranslation" escape="1"/>::<inp2:m_Phrase label="la_ToolTip_SetPrimaryTranslation" escape="1"/>',
+							function() {
+								Application.SetVar('translation_save_mode', 2);
+								submit_event('phrases','<inp2:phrases_SaveEvent/>');
+							}
+						)
+					);
+
+					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				</inp2:m_if>
+
 				a_toolbar.AddButton(
 					new ToolBarButton(
 						'cancel',
@@ -35,7 +57,7 @@
 
 				<inp2:m_if check="phrases_IsTopmostPrefix">
 					<inp2:m_if check="phrases_IsSingle" inverse="inverse">
-						a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+						a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 					</inp2:m_if>
 
 					a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
@@ -71,38 +93,47 @@
 	<inp2:m_RenderElement name="inp_edit_hidden" prefix="phrases" field="Phrase"/>
 </inp2:m_if>
 
-<inp2:m_DefineElement name="translations_element">
-	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
-	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
-	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
-</inp2:m_DefineElement>
+<inp2:m_DefineElement name="translations_element" prefix="phrases">
+	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="$prefix" field="Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
 
-<inp2:m_DefineElement name="phrase_element">
-	<inp2:m_if check="m_Get" name="simple_mode">
-		<inp2:m_RenderElement name="translations_element"/>
-	<inp2:m_else/>
-		<tr class="subsectiontitle">
-			<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
-		</tr>
+	<inp2:m_if check="phrases_ShowSourceLanguage">
+		<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="SourceTranslation" caption_render_as="source_language_field_caption_element"/>
+	</inp2:m_if>
 
-		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>
+	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="$prefix" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
 
-		<inp2:m_RenderElement name="translations_element"/>
+	<inp2:m_if check="phrases_ShowSourceLanguage">
+		<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="SourceHintTranslation" caption_render_as="source_language_field_caption_element"/>
+	</inp2:m_if>
 
-		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PhraseType"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" has_empty="1"/>
+	<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="$prefix" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
+
+	<inp2:m_if check="phrases_ShowSourceLanguage">
+		<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="SourceColumnTranslation" caption_render_as="source_language_field_caption_element"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<!--##<inp2:m_if check="m_GetEquals" name="phrases_label" value="ALEX, FIX IT!">
-			<inp2:phrases_MultipleEditing render_as="phrase_element"/>
-		<inp2:m_else/>##-->
-			<inp2:m_RenderElement name="phrase_element"/>
-		<!--##</inp2:m_if>##-->
+		<inp2:m_if check="m_Get" name="simple_mode">
+			<inp2:m_RenderElement name="translations_element"/>
+		<inp2:m_else/>
+			<tr class="subsectiontitle">
+				<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
+			</tr>
 
+			<inp2:m_if check="phrases_ShowSourceLanguage">
+				<inp2:m_RenderElement name="inp_label" prefix="phrases" field="TranslationInSync"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>
+
+			<inp2:m_RenderElement name="translations_element"/>
+
+			<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PhraseType"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" has_empty="1"/>
+		</inp2:m_if>
+
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>