Index: branches/RC/core/admin_templates/regional/languages_import.tpl
===================================================================
diff -u -r9853 -r10832
--- branches/RC/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 9853)
+++ branches/RC/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 10832)
@@ -12,7 +12,8 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('lang','OnImportLanguage');
+						Application.SetVar('next_template', 'regional/languages_list')
+						submit_event('lang','OnImportLanguage');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
@@ -27,15 +28,19 @@
 </tbody>
 </table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+<inp2:phrases.import_SaveWarning name="grid_save_warning"/>
+<inp2:phrases.import_ErrorWarning name="form_error_warning"/>
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
 
-	<inp2:m_RenderElement name="inp_edit_upload" prefix="phrases.import" field="LangFile" title="!la_fld_LanguageFile!"/>
+		<inp2:m_RenderElement name="inp_edit_upload" prefix="phrases.import" field="LangFile" title="!la_fld_LanguageFile!"/>
 
-	<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.import" field="PhraseType" title="!la_fld_InstallPhraseTypes!"/>
-	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.import" field="ImportOverwrite" hint_label="la_importlang_phrasewarning" title="la_prompt_overwritephrases"/>
+		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.import" field="PhraseType" title="!la_fld_InstallPhraseTypes!"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.import" field="ImportOverwrite" hint_label="la_importlang_phrasewarning" title="la_prompt_overwritephrases"/>
 
-	<!-- <inp2:m_RenderElement name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="!la_fld_InstallModules!" /> -->
-</table>
+		<!-- <inp2:m_RenderElement name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="!la_fld_InstallModules!" /> -->
+	</table>
+</div>
 
 <inp2:m_include t="incs/footer"/>