From 4463abe9bb8180d5494563e6cc9bfda57cf40478 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 23 Jan 2018 11:39:12 +0000
Subject: [PATCH 1/3] Added in the create XML for the legacy UserControl based
 Create Dialog

---
 src/Umbraco.Web.UI/umbraco/config/create/UI.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
index 23757d15ba..b0fac8393b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
@@ -11,6 +11,7 @@
     <header>Macro</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
+      <create assembly="umbraco" type="macroTasks" />
       <delete assembly="umbraco" type="macroTasks" />
     </tasks>
   </nodeType>

From d298388a7b02b0251a598dbfc9a9f7a74982e749 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 23 Jan 2018 11:47:59 +0000
Subject: [PATCH 2/3] Update the UI.Release XML too

---
 src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml b/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
index bac511f47a..ab2b89c0fb 100644
--- a/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
@@ -11,6 +11,7 @@
     <header>Macro</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
+      <create assembly="umbraco" type="macroTasks" />
       <delete assembly="umbraco" type="macroTasks" />
     </tasks>
   </nodeType>

From c68f832be64e20dee5417374a6035cba99b899c1 Mon Sep 17 00:00:00 2001
From: Robert <robertcopilau@gmail.com>
Date: Tue, 23 Jan 2018 14:34:03 +0100
Subject: [PATCH 3/3] Fixed anoying lower case delete action on macro context
 tree

---
 src/Umbraco.Web/Models/Trees/MenuItemList.cs | 2 +-
 src/Umbraco.Web/Trees/MacroTreeController.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Models/Trees/MenuItemList.cs b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
index 1f62e59e61..a450208905 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItemList.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Models.Trees
         /// <param name="name">The text to display for the menu item, will default to the IAction alias if not specified</param>
         internal MenuItem Add(IAction action, string name)
         {
-            var item = new MenuItem(action);
+            var item = new MenuItem(action, name);
 
             DetectLegacyActionMenu(action.GetType(), item);
 
diff --git a/src/Umbraco.Web/Trees/MacroTreeController.cs b/src/Umbraco.Web/Trees/MacroTreeController.cs
index 4a6ca8ad3d..5e0a8fa25a 100644
--- a/src/Umbraco.Web/Trees/MacroTreeController.cs
+++ b/src/Umbraco.Web/Trees/MacroTreeController.cs
@@ -65,7 +65,7 @@ namespace Umbraco.Web.Trees
                 throw new InvalidOperationException("Could not resolve the confirmation view for the legacy action " + ActionDelete.Instance.Alias);
             menuItem.LaunchDialogView(
                 legacyConfirmView.Result,
-                Services.TextService.Localize("general/delete"));
+                Services.TextService.Localize(string.Format("general/{0}", ActionDelete.Instance.Alias)));
 
             return menu;
         }