Index: branches/RC/kernel/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r8929 -r9853
--- branches/RC/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 9853)
@@ -23,9 +23,9 @@
 							submit_event('lang','OnCancelEdit');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('lang', '<inp2:lang_PrevId/>');
 						}
@@ -34,16 +34,16 @@
 							go_to_id('lang', '<inp2:lang_NextId/>');
 						}
 				 ) );
-				
-				
-				
+
+
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if check="lang_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if check="lang_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
@@ -59,23 +59,23 @@
 
 <inp2:lang_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>	
+	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
 		<inp2:m_RenderElement name="inp_id_label" prefix="lang" field="LanguageId" title="!la_fld_LanguageId!"/>
 		<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="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="DecimalPoint" title="!la_fld_DecimalPoint!"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ThousandSep" title="!la_fld_ThousandSep!"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="!la_fld_PrimaryLang!"/>
 		<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!" use_phrases="1"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!"/>
 	<inp2:m_if check="lang_IsNewMode">
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
@@ -95,7 +95,6 @@
 		<td class="error">&nbsp;</td>
 	</tr>
 	</inp2:m_if>
-</table>	
+</table>
 
 <inp2:m_include t="incs/footer"/>
-		
\ No newline at end of file
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r9678 -r9853
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 9678)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 9853)
@@ -471,7 +471,7 @@
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" onchange="<inp2:m_Param name="onchange"/>">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
+				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
 				<inp2:m_else/>
 					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
@@ -490,7 +490,7 @@
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<select multiple tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>_select" onchange="update_multiple_options('<inp2:{$prefix}_InputName field="$field"/>');">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
+				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
 				<inp2:m_else/>
 					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
@@ -513,11 +513,11 @@
 	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="<inp2:m_param name="onclick"/>" onchange="<inp2:m_param name="onchange"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="" use_phrases="1">
+<inp2:m_DefineElement name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="">
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
-			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
+			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 				<inp2:{$prefix}_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_phrase" selected="checked" onclick="$onclick" onchange="$onchange" />
 			<inp2:m_else />
 				<inp2:{$prefix}_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_item" selected="checked" onclick="$onclick" onchange="$onchange" />
@@ -559,7 +559,7 @@
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
-			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
+			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 				<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_phrase" selected="checked"/>
 			<inp2:m_else/>
 				<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_item" selected="checked"/>
Index: branches/RC/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r9662 -r9853
--- branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 9662)
+++ branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 9853)
@@ -68,8 +68,8 @@
 		<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
 	<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!" use_phrases="1"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!" use_phrases="1"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
Index: branches/RC/core/admin_templates/groups/groups_edit.tpl
===================================================================
diff -u -N -r8929 -r9853
--- branches/RC/core/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 9853)
@@ -64,7 +64,7 @@
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="Description" title="!la_fld_Comments!" rows="5" cols="30"/>
 
 		<inp2:m_if check="m_IsDebugMode">
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="g" field="Enabled" title="!la_fld_Enabled!" use_phrases="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="g" field="Enabled" title="!la_fld_Enabled!"/>
 		</inp2:m_if>
 </table>
 
Index: branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -N -r8929 -r9853
--- branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 9853)
@@ -67,7 +67,7 @@
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="!la_prompt_showgeneraltab!"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Heading" title="!la_prompt_heading!" size="40"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" use_phrases="1"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="DisplayOrder" title="!la_field_displayorder!" size="10"/>
 
Index: branches/RC/kernel/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r9662 -r9853
--- branches/RC/kernel/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 9662)
+++ branches/RC/kernel/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 9853)
@@ -68,8 +68,8 @@
 		<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
 	<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!" use_phrases="1"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!" use_phrases="1"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
 		<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
Index: branches/RC/kernel/admin_templates/groups/groups_edit.tpl
===================================================================
diff -u -N -r8929 -r9853
--- branches/RC/kernel/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 9853)
@@ -64,7 +64,7 @@
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="g" field="Description" title="!la_fld_Comments!" rows="5" cols="30"/>
 
 		<inp2:m_if check="m_IsDebugMode">
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="g" field="Enabled" title="!la_fld_Enabled!" use_phrases="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="g" field="Enabled" title="!la_fld_Enabled!"/>
 		</inp2:m_if>
 </table>
 
Index: branches/RC/kernel/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -N -r8929 -r9853
--- branches/RC/kernel/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 9853)
@@ -41,7 +41,7 @@
 		<td class="error"><inp2:phrases.export_Error field="LangFile"/>&nbsp;</td>
 	</tr>
 
-	<inp2:m_RenderElement name="inp_edit_checkboxes" use_phrases="1" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/>
+	<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/>
 	<inp2:m_RenderElement name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="!la_fld_ExportModules!"/>
 	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.export" field="DoNotEncode" title="!la_fld_DoNotEncode!"/>
 </table>
Index: branches/RC/kernel/admin_templates/regional/languages_import.tpl
===================================================================
diff -u -N -r8929 -r9853
--- branches/RC/kernel/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 9853)
@@ -21,7 +21,7 @@
 							submit_event('lang', 'OnGoBack');
 						}
 				 ) );
-				
+
 				a_toolbar.Render();
 			</script>
 		</td>
@@ -30,15 +30,14 @@
 </table>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>	
+	<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_checkboxes" use_phrases="1" prefix="phrases.import" field="PhraseType" title="!la_fld_InstallPhraseTypes!"/>
+
+	<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>	
+</table>
 
 <inp2:m_include t="incs/footer"/>
-		
\ No newline at end of file
Index: branches/RC/core/admin_templates/regional/languages_import.tpl
===================================================================
diff -u -N -r8929 -r9853
--- branches/RC/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 9853)
@@ -32,7 +32,7 @@
 
 	<inp2:m_RenderElement name="inp_edit_upload" prefix="phrases.import" field="LangFile" title="!la_fld_LanguageFile!"/>
 
-	<inp2:m_RenderElement name="inp_edit_checkboxes" use_phrases="1" prefix="phrases.import" field="PhraseType" title="!la_fld_InstallPhraseTypes!"/>
+	<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!" /> -->