Index: branches/5.0.x/themes/default2009/platform/login/forgot_password.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 12318)
@@ -92,8 +92,8 @@
 							<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_notice"/>
 							<input type="hidden" name="reset_confirm_template" value="platform/login/forgot_password_reset"/>
 
-							<input type="submit" class="button" name="events[u][OnForgotPassword]" value="<inp2:m_Phrase label="lu_btn_SendPassword"/>" />
-							<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" value="<inp2:m_phrase label="lu_btn_Cancel"/>">
+							<input type="submit" class="button" name="events[u][OnForgotPassword]" value="<inp2:m_Phrase label="lu_btn_SendPassword" no_editing="1"/>" />
+							<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
 						</inp2:m_RenderElement>
 					</table>
 				</form>
Index: branches/5.0.x/themes/default2009/platform/mailing_list/subscribe.tpl
===================================================================
diff -u -r12154 -r12318
--- branches/5.0.x/themes/default2009/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 12154)
+++ branches/5.0.x/themes/default2009/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 12318)
@@ -41,8 +41,8 @@
 				<br /><br />
 
 				<form method="POST" action="<inp2:m_FormAction />">
-					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes"/>" />&nbsp;
-					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
+					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
+					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
 					<input type="hidden" name="subscribe_ok_template" value="platform/mailing_list/subscribe_ok"/>
 				</form>
 			</inp2:m_RenderElement>
Index: branches/5.0.x/themes/default2009/platform/elements/forms.elm.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 12318)
@@ -462,7 +462,7 @@
 				<inp2:{$prefix}_CategorySelector render_as="selector_category_element" separator="&raquo;&nbsp;"/>
 			</select>
 
-			<input type="button" class="button" value="<inp2:m_Phrase name="lu_Add"/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name="{$prefix}_MaxCategories"/>);"/><br />
+			<input type="button" class="button" value="<inp2:m_Phrase label="lu_Add" no_editing="1"/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name="{$prefix}_MaxCategories"/>);"/><br />
 
 			<br />
 			<table class="item-categories" id="item_categories">
@@ -482,7 +482,7 @@
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
 
 			<script type="text/javascript">
-				var $delete_button = '&nbsp;&nbsp;<input type="button" class="delete-button" value="<inp2:m_Phrase name="lu_btn_Delete"/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
+				var $delete_button = '&nbsp;&nbsp;<input type="button" class="delete-button" value="<inp2:m_Phrase label="lu_btn_Delete" no_editing="1"/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
 				var $phrases = ['<inp2:m_Phrase name="lu_error_CategoryLimitReached" escape="1"/>', '<inp2:m_Phrase name="lu_error_AlreadyAdded"/>'];
 				var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>, $phrases);
 			</script>
Index: branches/5.0.x/themes/default2009/platform/mailing_list/unsubscribe.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 12318)
@@ -41,8 +41,8 @@
 				<br /><br />
 
 				<form method="POST" action="<inp2:m_FormAction />">
-					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes"/>" />&nbsp;
-					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
+					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
+					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
 					<input type="hidden" name="unsubscribe_ok_template" value="platform/mailing_list/unsubscribe_ok"/>
 				</form>
 			</inp2:m_RenderElement>
Index: branches/5.0.x/themes/default2009/platform/my_account/my_preferences.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/my_account/my_preferences.tpl	(.../my_preferences.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/my_account/my_preferences.tpl	(.../my_preferences.tpl)	(revision 12318)
@@ -104,7 +104,7 @@
 							</td>
 							<td>
 								<br />
-								<input class="button" type="submit" name="events[user-profile][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
+								<input class="button" type="submit" name="events[user-profile][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update" no_editing="1"/>"/>
 								<br /><br />
 							</td>
 							<td class="field-value">
Index: branches/5.0.x/themes/default2009/platform/thankyou.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/thankyou.tpl	(.../thankyou.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/thankyou.tpl	(.../thankyou.tpl)	(revision 12318)
@@ -44,7 +44,7 @@
 
 				<br /><br />
 
-				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:c_CategoryLink template="__default__"/>'" />&nbsp;
+				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:c_CategoryLink template="__default__"/>'" />&nbsp;
 			</inp2:m_RenderElement>
 		</div>
 	</div>
Index: branches/5.0.x/themes/default2009/platform/login/forgot_password_reset_notice.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/login/forgot_password_reset_notice.tpl	(.../forgot_password_reset_notice.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/login/forgot_password_reset_notice.tpl	(.../forgot_password_reset_notice.tpl)	(revision 12318)
@@ -46,7 +46,7 @@
 					<inp2:m_Phrase label="lu_text_ForgotPassResetEmailSent"/>
 					<br /><br />
 
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
+					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
 				</form>
 			</inp2:m_RenderElement>
 			<!-- // forgot password reset confirm -->
Index: branches/5.0.x/themes/default2009/platform/login/forgot_password_reset.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/login/forgot_password_reset.tpl	(.../forgot_password_reset.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/login/forgot_password_reset.tpl	(.../forgot_password_reset.tpl)	(revision 12318)
@@ -48,9 +48,9 @@
 
 				<inp2:m_if check="u_TestCodeIsValid">
 					<form method="POST" action="<inp2:m_FormAction />">
-						<input type="submit" name="events[u][OnResetPasswordConfirmed]" value="<inp2:m_Phrase label="lu_btn_Yes"/>" class="button" />
+						<input type="submit" name="events[u][OnResetPasswordConfirmed]" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" class="button" />
 
-						<input type="button" value="<inp2:m_Phrase label="lu_btn_No"/>" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" />
+						<input type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" />
 
 						<input type="hidden" name="user_key" value="<inp2:m_Get name="user_key"/>"/>
 						<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_confirm" />
Index: branches/5.0.x/themes/default2009/platform/login/forgot_password_reset_confirm.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/login/forgot_password_reset_confirm.tpl	(.../forgot_password_reset_confirm.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/login/forgot_password_reset_confirm.tpl	(.../forgot_password_reset_confirm.tpl)	(revision 12318)
@@ -47,7 +47,7 @@
 
 					<br /><br />
 
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" class="button" onclick="redirect('<inp2:m_Link template="platform/login/register" next_template="index"/>');"/>
+					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="platform/login/register" next_template="index"/>');"/>
 				</form>
 			</inp2:m_RenderElement>
 			<!-- // forgot password reset confirm -->
Index: branches/5.0.x/themes/default2009/platform/designs/form.tpl
===================================================================
diff -u -r12223 -r12318
--- branches/5.0.x/themes/default2009/platform/designs/form.tpl	(.../form.tpl)	(revision 12223)
+++ branches/5.0.x/themes/default2009/platform/designs/form.tpl	(.../form.tpl)	(revision 12318)
@@ -52,7 +52,7 @@
 							<inp2:formflds_PrintList render_as="form_field" SourcePrefix="formsubs" per_page="-1"/>
 
 							<inp2:m_RenderElement design="inp_edit_buttons">
-								<input type="submit" class="button" name="events[formsubs][OnCreate]" value="<inp2:m_Phrase label="lu_send"/>"/>
+								<input type="submit" class="button" name="events[formsubs][OnCreate]" value="<inp2:m_Phrase label="lu_send" no_editing="1"/>"/>
 
 								<input type="hidden" name="<inp2:formsubs_InputName field="FormId"/>" value="<inp2:m_Get var="form_id"/>"/>
 								<input type="hidden" name="form_id" value="<inp2:m_Get var="form_id"/>"/>
Index: branches/5.0.x/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl	(.../unsubscribe_ok.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl	(.../unsubscribe_ok.tpl)	(revision 12318)
@@ -40,7 +40,7 @@
 				<inp2:m_Phrase label="lu_TextUnsubscribe"/>
 				<br /><br />
 
-				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
 			</inp2:m_RenderElement>
 		</div>
 	</div>
Index: branches/5.0.x/themes/default2009/platform/recommend/recommend.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/recommend/recommend.tpl	(.../recommend.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/recommend/recommend.tpl	(.../recommend.tpl)	(revision 12318)
@@ -40,7 +40,7 @@
 				<inp2:m_Phrase label="lu_recommend_confirm_text" />
 				<br /><br />
 
-				<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" />');" value="<inp2:m_Phrase label="lu_btn_Ok"/>"/>
+				<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" />');" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>"/>
 			</inp2:m_RenderElement>
 		</div>
 	</div>
Index: branches/5.0.x/themes/default2009/platform/elements/pagination.elm.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/elements/pagination.elm.tpl	(.../pagination.elm.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/elements/pagination.elm.tpl	(.../pagination.elm.tpl)	(revision 12318)
@@ -44,7 +44,7 @@
 					<option value="20" <inp2:{$prefix}_PerPageSelected per_page="20" selected='selected="selected"'/>>20</option>
 					<option value="50" <inp2:{$prefix}_PerPageSelected per_page="50" selected='selected="selected"'/>>50</option>
 				</select>
-				<input type="submit" class="button" name="<inp2:{$prefix}_SubmitName event="OnSetPerPage"/>" value="<inp2:m_Phrase label="lu_btn_Set"/>" />
+				<input type="submit" class="button" name="<inp2:{$prefix}_SubmitName event="OnSetPerPage"/>" value="<inp2:m_Phrase label="lu_btn_Set" no_editing="1"/>" />
 			</form>
 		</td>
 	</tr>
Index: branches/5.0.x/themes/default2009/platform/my_account/my_profile.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 12318)
@@ -67,7 +67,7 @@
 						<inp2:m_RenderElement name="inp_edit_image_upload" prefix="u" field="PrimaryImage" title="lu_prompt_Avatar" is_last="1"/>
 
 						<inp2:m_RenderElement design="inp_edit_buttons">
-							<input class="button" type="submit" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
+							<input class="button" type="submit" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update" no_editing="1"/>"/>
 							<input type="hidden" name="next_template" value="platform/my_account/my_account"/>
 						</inp2:m_RenderElement>
 					</table>
Index: branches/5.0.x/themes/default2009/platform/categories/suggest_category.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 12318)
@@ -59,7 +59,7 @@
 							<inp2:m_RenderElement design="inp_edit_buttons">
 								<input type="hidden" name="suggest_confirm_template" value="platform/categories/suggest_confirm"/>
 								<input type="hidden" name="suggest_pending_confirm_template" value="platform/categories/suggest_pending_confirm"/>
-								<input class="button" type="submit" name="events[c][OnCreate]" value="<inp2:m_phrase label="lu_btn_Create"/>"/>
+								<input class="button" type="submit" name="events[c][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
 							</inp2:m_RenderElement>
 						</table>
 					</form>
Index: branches/5.0.x/themes/default2009/platform/elements/categories.elm.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 12318)
@@ -67,7 +67,7 @@
 			<inp2:m_Param name="category_name"/>
 		</td>
 		<td>
-			<input type="button" class="delete-button" value="<inp2:m_Phrase name="lu_btn_Delete"/>" onclick="$ItemCategories.DeleteCategory(<inp2:m_Param name="category_id"/>);"/>
+			<input type="button" class="delete-button" value="<inp2:m_Phrase label="lu_btn_Delete" no_editing="1"/>" onclick="$ItemCategories.DeleteCategory(<inp2:m_Param name="category_id"/>);"/>
 		</td>
 	</tr>
 </inp2:m_DefineElement>
Index: branches/5.0.x/themes/default2009/platform/elements/side_boxes/search.elm.tpl
===================================================================
diff -u -r12298 -r12318
--- branches/5.0.x/themes/default2009/platform/elements/side_boxes/search.elm.tpl	(.../search.elm.tpl)	(revision 12298)
+++ branches/5.0.x/themes/default2009/platform/elements/side_boxes/search.elm.tpl	(.../search.elm.tpl)	(revision 12318)
@@ -40,7 +40,7 @@
 	<table>
 		<tr>
 			<td width="10">
-				<input class="button" type="submit" style="width: 40px;" value="<inp2:m_Phrase label="lu_comm_Go"/>!" />
+				<input class="button" type="submit" style="width: 40px;" value="<inp2:m_Phrase label="lu_comm_Go" no_editing="1"/>!" />
 			</td>
 			<td align="left">
 				<a href="<inp2:m_Link template="platform/search/advanced_search" />" class="more-link"><inp2:m_Phrase label="lu_btn_AdvancedSearch"/></a>  <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" /><br />
Index: branches/5.0.x/themes/default2009/platform/mailing_list/subscribe_ok.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/mailing_list/subscribe_ok.tpl	(.../subscribe_ok.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/mailing_list/subscribe_ok.tpl	(.../subscribe_ok.tpl)	(revision 12318)
@@ -40,7 +40,7 @@
 				<inp2:m_Phrase label="lu_ThankForSubscribing"/>
 				<br /><br />
 
-				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
 			</inp2:m_RenderElement>
 		</div>
 	</div>
Index: branches/5.0.x/themes/default2009/platform/login/register.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/login/register.tpl	(.../register.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/login/register.tpl	(.../register.tpl)	(revision 12318)
@@ -93,8 +93,8 @@
 							<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm" />
 							<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending" />
 
-							<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register"/>"/>
-							<input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase name="lu_btn_Cancel"/>"/>
+							<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
+							<input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>"/>
 						</inp2:m_RenderElement>
 					</table>
 				</form>
Index: branches/5.0.x/themes/default2009/platform/login/register_confirm.tpl
===================================================================
diff -u -r12117 -r12318
--- branches/5.0.x/themes/default2009/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 12117)
+++ branches/5.0.x/themes/default2009/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 12318)
@@ -49,7 +49,7 @@
 					</inp2:m_if>
 
 					<br /><br />
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
+					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
 				</form>
 			</inp2:m_RenderElement>
 			<!-- // registration confirmation -->