Index: branches/RC/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -r11134 -r11538
--- branches/RC/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 11134)
+++ branches/RC/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 11538)
@@ -1,10 +1,8 @@
 <inp2:adm_SetPopupSize width="888" height="415"/>
-<inp2:m_RequireLogin permissions="in-portal:configure_lang.view" system="1"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="section_header" icon="icon46_conf_regional" title="!la_title_RegionalSettings!"/>
+<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="phrase_edit"/>
 
-<inp2:m_RenderElement name="blue_bar" prefix="phrases" title_preset="phrase_edit" module="in-portal" icon="icon46_conf_regional"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -51,8 +49,10 @@
 </table>
 
 <inp2:phrases_SaveWarning name="grid_save_warning"/>
+<inp2:phrases_ErrorWarning name="form_error_warning"/>
+
 <div id="scroll_container">
-<table class="edit-form">
+	<table class="edit-form">
 		<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get name="phrases_label"/>">
 		<inp2:m_DefineElement name="phrase_element">
 			<tr class="subsectiontitle">
@@ -78,7 +78,7 @@
 		<inp2:m_else/>
 			<inp2:m_RenderElement name="phrase_element"/>
 		</inp2:m_if>
-</table>
+	</table>
 </div>
 
-<inp2:m_include t="incs/footer"/>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file