Index: branches/5.1.x/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r13949 -r13950
--- branches/5.1.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 13949)
+++ branches/5.1.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 13950)
@@ -62,13 +62,11 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="PackName" title="la_fld_PackName"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="LocalName" title="la_fld_LocalName"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Charset" title="la_fld_Charset"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconURL" title="la_fld_IconURL"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconDisabledURL" title="la_fld_IconDisabledURL"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DateFormat" title="la_fld_DateFormat"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="TimeFormat" title="la_fld_TimeFormat"/>
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputDateFormat" title="la_fld_InputDateFormat"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputTimeFormat" title="la_fld_InputTimeFormat"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DateFormat" title="la_fld_DateFormat"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="TimeFormat" title="la_fld_TimeFormat"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DecimalPoint" title="la_fld_DecimalPoint"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ThousandSep" title="la_fld_ThousandSep"/>
@@ -77,10 +75,14 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Priority" title="la_fld_Priority"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="Enabled" title="la_fld_Enabled"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="la_fld_UnitSystem"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="Locale" title="la_fld_Locale"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="FilenameReplacements" title="la_fld_FilenameReplacements" allow_html="0" control_options="{min_height: 200}" cols="50" rows="10"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="Locale" title="la_fld_Locale" has_empty="1"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconURL" title="la_fld_IconURL"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconDisabledURL" title="la_fld_IconDisabledURL"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="UserDocsUrl" title="la_fld_UserDocsUrl"/>
 
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="FilenameReplacements" title="la_fld_FilenameReplacements" allow_html="0" control_options="{min_height: 200}" cols="50" rows="10"/>
+
 			<inp2:m_if check="lang_IsNewMode">
 				<inp2:m_if check="lang_FieldVisible" field="CopyLabels">
 					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">