Index: branches/5.1.x/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 13086)
@@ -31,7 +31,7 @@
 				menuMgr.timeout = 500;
 				menuMgr.flowOverFormElement = true;
 
-	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 	  			var $is_catalog = true;
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_', 'Catalog');
 				$Catalog.TabByCategory = <inp2:m_if check="m_GetConfig" name="Catalog_PreselectModuleTab">true<inp2:m_else/>false</inp2:m_if>;
@@ -170,7 +170,7 @@
 			 	a_toolbar.AddButton(
 			 		new ToolBarButton(
 			 			'move_up',
-			 			'<inp2:m_phrase label="la_ToolTip_Move_Up" escape="1"/>::<inp2:m_phrase label="la_ToolTipShort_Move_Up" escape="1"/>',
+			 			'<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>::<inp2:m_phrase label="la_ToolTipShort_Move_Up" escape="1"/>',
 			 			function() {
 							$Catalog.submit_event(null, 'OnMassMoveUp');
 						}
@@ -180,7 +180,7 @@
 				a_toolbar.AddButton(
 					new ToolBarButton(
 						'move_down',
-						'<inp2:m_phrase label="la_ToolTip_Move_Down" escape="1"/>::<inp2:m_phrase label="la_ToolTipShort_Move_Down" escape="1"/>',
+						'<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>::<inp2:m_phrase label="la_ToolTipShort_Move_Down" escape="1"/>',
 						function() {
 							$Catalog.submit_event(null, 'OnMassMoveDown');
 						}
@@ -221,7 +221,7 @@
 							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
-							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'categories/categories_edit' : 'categories/categories_edit_permissions');
+							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id == 0 || $category_id == <inp2:c_HomeCategory/> ? 'categories/categories_edit_permissions' : 'categories/categories_edit');
 							direct_edit('c', $redirect_url);
 							break;