Merge

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

@@ -685,6 +685,7 @@ To manage your website, simply open the umbraco back office and start adding con
     <key alias="editTemplateSaved">Template saved</key>
     <key alias="editUserError">Error saving user (check log)</key>
     <key alias="editUserSaved">User Saved</key>
+    <key alias="editUserTypeSaved">User type saved</key>
     <key alias="fileErrorHeader">File not saved</key>
     <key alias="fileErrorText">file could not be saved. Please check file permissions</key>
     <key alias="fileSavedHeader">File saved</key>

src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs

@@ -25,7 +25,7 @@ namespace umbraco.presentation.create
             sbmt.Text = ui.Text("create");
             if (!Page.IsPostBack) {
                 foreach (MacroEngineLanguage lang in MacroEngineFactory.GetSupportedUILanguages()) {
-                    filetype.Items.Add(new ListItem(string.Format("{0} by {1}", helper.SpaceCamelCasing(lang.Extension), lang.EngineName), lang.Extension));
+                    filetype.Items.Add(new ListItem(string.Format(".{0} ({1})", lang.Extension.ToLowerInvariant(), lang.EngineName), lang.Extension));
                 }
                 filetype.SelectedIndex = 0;
             }

src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs

@@ -462,7 +462,7 @@ namespace umbraco.cms.presentation
                 string showPageDisabledText = ui.Text("buttons", "showPageDisabled", this.getUser());
                 if (showPageDisabledText.StartsWith("["))
                     showPageDisabledText = ui.GetText("buttons", "showPageDisabled", null, "en"); ;
-                menu.NewElement("PreviewDisabled", "previewDisabled", "disabled", 0);
+
                 menuItem.AltText = showPageDisabledText;
                 ((Image) menuItem).Attributes.Add("style", "opacity: 0.5");
             }

src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs

@@ -70,7 +70,7 @@ namespace umbraco.cms.presentation.user
             userType.DefaultPermissions = actions;
             userType.Save();
 
-            speechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editUserSaved", base.getUser()), "");
+            speechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editUserTypeSaved", base.getUser()), "");
         }
 
         protected List<IAction> CurrentUserTypeActions

src/umbraco.cms/businesslogic/Dictionary.cs

@@ -293,6 +293,9 @@ namespace umbraco.cms.businesslogic
 
             public void setValue(int languageId, string value)
             {
+                // Calling Save method triggers the Saving event
+                Save();
+
                 if (Item.hasText(UniqueId, languageId))
                     Item.setText(languageId, UniqueId, value);
                 else
@@ -301,7 +304,12 @@ namespace umbraco.cms.businesslogic
 
             public string Value()
             {
-                return Item.Text(UniqueId, 1);
+                if (Item.hasText(UniqueId, 1))
+                {
+                    return Item.Text(UniqueId, 1);
+                }
+
+                return string.Empty;
             }
 
             /// <summary>
@@ -310,6 +318,9 @@ namespace umbraco.cms.businesslogic
             /// <param name="value"></param>
             public void setValue(string value)
             {
+                // Calling Save method triggers the Saving event
+                Save();
+
                 if (Item.hasText(UniqueId, 0))
                     Item.setText(0, UniqueId, value);
                 else
@@ -354,6 +365,7 @@ namespace umbraco.cms.businesslogic
                 DictionaryItems.Remove(key);
             }
 
+            [Obsolete("Does not save the dictionary item, use setValue() instead.")]
             public void Save()
             {
                 OnSaving(EventArgs.Empty);

src/umbraco.cms/businesslogic/macro/MacroEngineFactory.cs

@@ -66,7 +66,7 @@ namespace umbraco.cms.businesslogic.macro
                     if (languages.Find(t => t.Extension == lang) == null)
                         languages.Add(new MacroEngineLanguage(lang, engine.Name));
             }
-            return languages;
+            return languages.OrderBy(s => s.Extension);
         }
 
         public static List<IMacroEngine> GetAll()