Merge pull request #1023 from umbraco/temp-U4-7212

U4-7212 All new text for content type editor needs to be localized.

src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js

@@ -60,10 +60,10 @@
 
          function setButtonText() {
              if (!scope.model.closeButtonLabelKey && !scope.model.closeButtonLabel) {
-                 scope.model.closeButtonLabel = localizationService.localize("general_close").then(function (value) {return value;});
+                 scope.model.closeButtonLabel = localizationService.localize("general_close");
              }
              if (!scope.model.submitButtonLabelKey && !scope.model.submitButtonLabel) {
-                 scope.model.submitButtonLabel = localizationService.localize("general_submit").then(function (value) {return value;});
+                 scope.model.submitButtonLabel = localizationService.localize("general_submit");
              }
          }
 

src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js

@@ -9,7 +9,7 @@
       scope.toolbar = [];
       scope.sortableOptionsGroup = {};
       scope.sortableOptionsProperty = {};
-      scope.sortingButtonLabel = "Reorder";
+      scope.sortingButtonKey = "general_reorder";
 
       function activate() {
 
@@ -200,9 +200,9 @@
          scope.sortingMode = !scope.sortingMode;
 
          if(scope.sortingMode === true) {
-            scope.sortingButtonLabel = "I'm done reordering";
+            scope.sortingButtonKey = "general_reorderDone";
          } else {
-            scope.sortingButtonLabel = "Reorder";
+            scope.sortingButtonKey = "general_reorder";
          }
 
       };

src/Umbraco.Web.UI.Client/src/common/services/localization.service.js

@@ -1,6 +1,7 @@
 angular.module('umbraco.services')
 .factory('localizationService', function ($http, $q, eventsService, $window, $filter, userService) {
 
+    //TODO: This should be injected as server vars
     var url = "LocalizedText";
     var resourceFileLoadStatus = "none";
     var resourceLoadingPromise = [];
@@ -37,6 +38,11 @@ angular.module('umbraco.services')
         initLocalizedResources: function () {
             var deferred = $q.defer();
 
+            if (resourceFileLoadStatus === "loaded") {
+                deferred.resolve(service.dictionary);
+                return deferred.promise;
+            }
+
             //if the resource is already loading, we don't want to force it to load another one in tandem, we'd rather
             // wait for that initial http promise to finish and then return this one with the dictionary loaded
             if (resourceFileLoadStatus === "loading") {
@@ -91,25 +97,13 @@ angular.module('umbraco.services')
 
         // checks the dictionary for a localized resource string
         localize: function (value, tokens) {
-            var deferred = $q.defer();
-
-            if (resourceFileLoadStatus === "loaded") {
-                var val = _lookup(value, tokens, service.dictionary);
-                deferred.resolve(val);
-            } else {
-                service.initLocalizedResources().then(function (dic) {
-                    var val = _lookup(value, tokens, dic);
-                    deferred.resolve(val);
-                });
-            }
-
-            return deferred.promise;
+            return service.initLocalizedResources().then(function (dic) {
+                var val = _lookup(value, tokens, dic);
+                return val;
+            });
         },
-        
-    };
 
-    // force the load of the resource file
-    service.initLocalizedResources();
+    };
 
     //This happens after login / auth and assets loading
     eventsService.on("app.authenticated", function () {
@@ -119,4 +113,4 @@ angular.module('umbraco.services')
 
     // return the local instance when called
     return service;
-});
+});

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html

@@ -7,24 +7,25 @@
                    style="width: 100%"
                    ng-model="searchTerm"
                    class="umb-search-field search-query input-block-level"
-                   placeholder="Filter..."
+         localize="placeholder"
+         placeholder="@placeholders_filter"
                    umb-auto-focus>
         </div>
     </div>
 
     <div class="umb-control-group">
-        <small>Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</small>
+    <small><localize key="contentTypeEditor_compositionsDescription"></localize></small>
     </div>
 
     <umb-empty-state
         ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes <= 1"
         position="center">
-        There are no content types available to use as a composition.
+    <localize key="contentTypeEditor_noAvailableCompositions"></localize>
     </umb-empty-state>
     <umb-empty-state
         ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes > 1"
         position="center">
-        This content type is used in a composition, and therefore cannot be composed itself.
+    <localize key="contentTypeEditor_compositionInUse"></localize>
     </umb-empty-state>
 
     <ul class="umb-checkbox-list">

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js

@@ -10,10 +10,14 @@
  (function() {
 	"use strict";
 
-	function EditorPickerOverlay($scope, dataTypeResource, dataTypeHelper, contentTypeResource) {
+	function EditorPickerOverlay($scope, dataTypeResource, dataTypeHelper, contentTypeResource, localizationService) {
 
 		var vm = this;
 
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("defaultdialogs_selectEditor");
+        }
+
 		vm.searchTerm = "";
 		vm.showTabs = false;
 		vm.tabsLoaded = 0;
@@ -21,14 +25,14 @@
 			{
 				active: true,
 				id: 1,
-				label: "Available Editors",
+                label: localizationService.localize("contentTypeEditor_availableEditors"),
 				alias: "Default",
 				typesAndEditors: []
 			},
 			{
 				active: false,
 				id: 2,
-				label: "Reuse",
+                label: localizationService.localize("contentTypeEditor_reuse"),
 				alias: "Reuse",
 				userConfigured: []
 			}
@@ -143,34 +147,27 @@
       }
 
       function openEditorSettingsOverlay(dataType, isNew) {
-         vm.editorSettingsOverlay = {};
-         vm.editorSettingsOverlay.title = "Editor settings";
-         vm.editorSettingsOverlay.dataType = dataType;
-         vm.editorSettingsOverlay.view = "views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html";
-         vm.editorSettingsOverlay.show = true;
+         vm.editorSettingsOverlay = {
+             title: localizationService.localize("contentTypeEditor_editorSettings"),
+             dataType: dataType,
+             view: "views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html",
+             show: true,
+             submit: function(model) {
+                 var preValues = dataTypeHelper.createPreValueProps(model.dataType.preValues);
 
-         vm.editorSettingsOverlay.submit = function(model) {
+                 dataTypeResource.save(model.dataType, preValues, isNew).then(function(newDataType) {
 
-            var preValues = dataTypeHelper.createPreValueProps(model.dataType.preValues);
+                    contentTypeResource.getPropertyTypeScaffold(newDataType.id).then(function(propertyType) {
 
-            dataTypeResource.save(model.dataType, preValues, isNew).then(function(newDataType) {
+                       submitOverlay(newDataType, propertyType, true);
 
-               contentTypeResource.getPropertyTypeScaffold(newDataType.id).then(function(propertyType) {
+                       vm.editorSettingsOverlay.show = false;
+                       vm.editorSettingsOverlay = null;
 
-                  submitOverlay(newDataType, propertyType, true);
+                    });
 
-                  vm.editorSettingsOverlay.show = false;
-                  vm.editorSettingsOverlay = null;
-
-               });
-
-            });
-
-         };
-
-         vm.editorSettingsOverlay.close = function(oldModel) {
-            vm.editorSettingsOverlay.show = false;
-            vm.editorSettingsOverlay = null;
+                 });
+             }
          };
 
       }

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html

@@ -8,7 +8,8 @@
 				ng-change="vm.filterItems()"
 				ng-model="vm.searchTerm"
 				class="umb-search-field search-query input-block-level"
-				placeholder="Filter..."
+				localize="placeholder"
+	            placeholder="@placeholders_filter"
 				umb-auto-focus>
 		</div>
 	</div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html

@@ -1,18 +1,20 @@
 <div class="umb-control-group" ng-if="model.dataType.id !== 0">
    <i class="icon-alert red"></i>
-   <strong class="red">All Document types</strong> using this editor will get updated with the new settings.
+   <strong class="red"><localize key="contentTypeEditor_allDocumentTypes"></localize></strong> using this editor will get updated with the new settings.
 </div>
 
 <div class="control-group umb-control-group">
    <div class="umb-el-wrap">
-      <label class="control-label" for="dataTypeName">Name</label>
+      <label class="control-label" for="dataTypeName">
+          <localize key="name"></localize>
+      </label>
       <div class="controls">
          <input type="text" ng-model="model.dataType.name" class="umb-editor" umb-auto-focus focus-on-filled="true" required />
       </div>
    </div>
 </div>
 
-<h5>Configuration</h5>
+<h5><localize key="contentTypeEditor_configuration"></localize></h5>
 
 <umb-property property="preValue" ng-repeat="preValue in model.dataType.preValues">
    <umb-editor model="preValue" is-pre-value="true"></umb-editor>

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js

@@ -10,7 +10,7 @@
  (function() {
  	"use strict";
 
-   function PropertySettingsOverlay($scope, contentTypeResource, dataTypeResource, dataTypeHelper) {
+   function PropertySettingsOverlay($scope, contentTypeResource, dataTypeResource, dataTypeHelper, localizationService) {
 
       var vm = this;
 
@@ -20,25 +20,25 @@
       vm.selectedValidationType = {};
       vm.validationTypes = [
          {
-            "name": "Validate as email",
+            "name": localizationService.localize("validation_validateAsEmail"),
             "key": "email",
             "pattern": "[a-zA-Z0-9_\.\+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-\.]+",
             "enableEditing": true
          },
          {
-            "name": "Validate as a number",
+            "name": localizationService.localize("validation_validateAsNumber"),
             "key": "number",
             "pattern": "^[0-9]*$",
             "enableEditing": true
          },
          {
-            "name": "Validate as a Url",
+            "name": localizationService.localize("validation_validateAsUrl"),
             "key": "url",
             "pattern": "https?\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,}",
             "enableEditing": true
          },
          {
-            "name": "...or enter a custom validation",
+            "name": localizationService.localize("validation_enterCustomValidation"),
             "key": "custom",
             "pattern": "",
             "enableEditing": true
@@ -65,7 +65,6 @@
          vm.focusOnMandatoryField = false;
 
          vm.editorPickerOverlay = {};
-         vm.editorPickerOverlay.title = "Choose editor";
          vm.editorPickerOverlay.property = $scope.model.property;
          vm.editorPickerOverlay.contentTypeName = $scope.model.contentTypeName;
          vm.editorPickerOverlay.view = "views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html";

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html

@@ -5,7 +5,8 @@
            <textarea class="editor-label"
                name="propertyLabel"
                ng-model="model.property.label"
-               placeholder="Enter a name..."
+               localize="placeholder"
+               placeholder="@placeholders_entername"
                umb-auto-focus
                focus-on-filled="true"
                umb-auto-resize
@@ -23,7 +24,8 @@
       <textarea
           class="editor-description"
           ng-model="model.property.description"
-          placeholder="Add your description here..."
+          localize="placeholder"
+          placeholder="@placeholders_enterDescription"
           overlay-submit-on-enter
           umb-auto-resize>
       </textarea>
@@ -31,7 +33,9 @@
 
    <div class="editor-wrapper umb-control-group control-group" ng-model="model.property.editor" val-require-component>
 
-      <a href="" ng-if="!model.property.editor" class="editor-placeholder" hotkey="alt+shift+e" ng-click="vm.openEditorPickerOverlay(model.property)">Add Editor</a>
+      <a href="" ng-if="!model.property.editor" class="editor-placeholder" hotkey="alt+shift+e" ng-click="vm.openEditorPickerOverlay(model.property)">
+          <localize key="shortcuts_addEditor"></localize>
+      </a>
 
       <div class="editor clearfix" ng-if="model.property.editor">
 
@@ -58,7 +62,8 @@
    <div class="umb-control-group clearfix">
 
       <label class="checkbox no-indent">
-         <input type="checkbox" ng-model="model.property.validation.mandatory" focus-when="{{vm.focusOnMandatoryField}}"> Field is mandatory
+         <input type="checkbox" ng-model="model.property.validation.mandatory" focus-when="{{vm.focusOnMandatoryField}}">
+         <localize key="validation_fieldIsMandatory"></localize>
       </label>
 
       <select class="umb-dropdown" ng-options="validationType.name for validationType in vm.validationTypes" ng-model="vm.selectedValidationType" ng-change="vm.changeValidationType(vm.selectedValidationType)">

src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js

@@ -5,6 +5,10 @@
 
       var vm = this;
 
+      if(!$scope.model.title) {
+          $scope.model.title = localizationService.localize("general_copy");
+      }
+
       vm.hideSearch = hideSearch;
       vm.selectResult = selectResult;
       vm.onSearchResults = onSearchResults;

src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html

@@ -32,7 +32,10 @@
 
    <div class="umb-control-group -no-border">
       <input type="checkbox" class="pull-left" style="margin-right: 10px;" ng-model="model.relateToOriginal" />
-      <label>Relate to original</label>
+      <label>
+          <localize key="defaultdialogs_relateToOriginalLabel">Relate to originalt</localize>
+      </label>
+
    </div>
 
 </div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js

@@ -1,13 +1,16 @@
 (function() {
    "use strict";
 
-   function EmbedOverlay($scope, $http, umbRequestHelper) {
+   function EmbedOverlay($scope, $http, umbRequestHelper, localizationService) {
 
       var vm = this;
       var origWidth = 500;
       var origHeight = 300;
 
-      $scope.model.title = "Embed";
+      if(!$scope.model.title) {
+          $scope.model.title = localizationService.localize("general_embed");
+      }
+
       $scope.model.embed = {
          url: "",
          width: 360,

src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js

@@ -2,9 +2,12 @@ angular.module("umbraco")
     .controller("Umbraco.Overlays.HelpController", function ($scope, $location, $routeParams, helpService, userService, localizationService) {
         $scope.section = $routeParams.section;
         $scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion;
-        $scope.model.title = "Help";
         $scope.model.subtitle = "Umbraco version" + " " + $scope.version;
 
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("general_help");
+        }
+
         if(!$scope.section){
             $scope.section = "content";
         }
@@ -19,11 +22,6 @@ angular.module("umbraco")
             $scope.sectionName = value;
         });
 
-        // translate dialog title
-        localizationService.localize("sections_help").then(function (value) {
-            $scope.model.title = value;
-        });
-
         userService.getCurrentUser().then(function(user){
 
         	rq.usertype = user.userType;

src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html

@@ -18,7 +18,9 @@
                 <a target="_blank" href="http://our.umbraco.org?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=our">
                      <localize key="help_goTo">go to</localize> our.umbraco.org
                 </a>
-                <small class="umb-detail">The friendliest community</small>
+                <small class="umb-detail">
+                    <localize key="defaultdialogs_theFriendliestCommunity">The friendliest community</localize>
+                </small>
             </li>
         </ul>
     </div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js

@@ -6,14 +6,14 @@
  * @description
  * The controller for the content type editor property dialog
  */
-function IconPickerOverlay($scope, iconHelper) {
+function IconPickerOverlay($scope, iconHelper, localizationService) {
 
    $scope.loading = true;
    $scope.model.hideSubmitButton = true;
 
-   if(!$scope.model.title) {
-       $scope.model.title = "Select an icon";
-   }
+    if (!$scope.model.title) {
+        $scope.model.title = localizationService.localize("defaultdialogs_selectIcon");
+    }
 
    iconHelper.getIcons().then(function(icons) {
       $scope.icons = icons;

src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html

@@ -7,19 +7,32 @@
                    style="width: 100%"
                    ng-model="searchTerm"
                    class="umb-search-field search-query input-block-level"
-                   placeholder="Filter..."
+                   localize="placeholder"
+                   placeholder="@placeholders_filter"
                    umb-auto-focus>
         </div>
     </div>
 
     <div class="umb-control-group">
         <select ng-model="color" class="input-block-level">
-            <option value="">Black</option>
-            <option value="color-green">Green</option>
-            <option value="color-yellow">Yellow</option>
-            <option value="color-orange">Orange</option>
-            <option value="color-blue">Blue</option>
-            <option value="color-red">Red</option>
+            <option value="">
+                <localize key="color_black">Black</localize>
+            </option>
+            <option value="color-green">
+                <localize key="color_green">Green</localize>
+            </option>
+            <option value="color-yellow">
+                <localize key="color_yellow">Yellow</localize>
+            </option>
+            <option value="color-orange">
+                <localize key="color_orange">Orange</localize>
+            </option>
+            <option value="color-blue">
+                <localize key="color_blue">Blue</localize>
+            </option>
+            <option value="color-red">
+                <localize key="color_red">Red</localize>
+            </option>
         </select>
     </div>
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js

@@ -1,11 +1,15 @@
-function ItemPickerOverlay($scope) {
+function ItemPickerOverlay($scope, localizationService) {
 
-   $scope.model.hideSubmitButton = true;
+    if (!$scope.model.title) {
+        $scope.model.title = localizationService.localize("defaultdialogs_selectItem");
+    }
 
-   $scope.selectItem = function(item) {
-       $scope.model.selectedItem = item;
-       $scope.submitForm($scope.model);
-   };
+    $scope.model.hideSubmitButton = true;
+
+    $scope.selectItem = function(item) {
+        $scope.model.selectedItem = item;
+        $scope.submitForm($scope.model);
+    };
 
 }
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html

@@ -6,7 +6,8 @@
         style="width: 100%"
         ng-model="searchTerm"
         class="umb-search-field search-query input-block-level"
-        placeholder="Filter..."
+        localize="placeholder"
+        placeholder="@placeholders_filter"
         umb-auto-focus />
     </div>
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js

@@ -8,9 +8,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 	        searchText = value + "...";
 	    });
 
-        if(!$scope.model.title) {
-            $scope.model.title = "Link picker";
-        }
+		if(!$scope.model.title) {
+		    $scope.model.title = localizationService.localize("defaultdialogs_selectLink");
+		}
 
 	    $scope.dialogTreeEventHandler = $({});
 	    $scope.model.target = {};

src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html

@@ -20,14 +20,22 @@
     <umb-control-group label="@content_target">
         <select class="umb-editor umb-dropdown" ng-model="model.target.target">
             <option value=""></option>
-            <option value="_blank">Opens the linked document in a new window or tab</option>
-            <option value="_top">Opens the linked document in the full body of the window</option>
-            <option value="_parent">Opens the linked document in the parent frame</option>
+            <option value="_blank">
+                <localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize>
+            </option>
+            <option value="_top">
+                <localize key="defaultdialogs_openInFullBody">Opens the linked document in the full body of the window</localize>
+            </option>
+            <option value="_parent">
+                <localize key="defaultdialogs_openInParentFrame">Opens the linked document in the parent frame</localize>
+            </option>
         </select>
     </umb-control-group>
 
     <div class="umb-control-group">
-        <h5>Link to page</h5>
+        <h5>
+            <localize key="defaultdialogs_linkToPage">Link to page</localize>
+        </h5>
 
         <umb-tree-search-box
             hide-search-callback="hideSearch"
@@ -60,8 +68,12 @@
     </div>
 
     <div class="umb-control-group">
-        <h5>Link to media</h5>
-        <a href ng-click="switchToMediaPicker()" class="btn">Select media</a>
+        <h5>
+            <localize key="defaultdialogs_linkToMedia">Link to media</localize>
+        </h5>
+        <a href ng-click="switchToMediaPicker()" class="btn">
+            <localize key="defaultdialogs_selectMedia">Select media</localize>
+        </a>
     </div>
 
     <umb-overlay

src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js

@@ -1,7 +1,10 @@
-function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper) {
+function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper, localizationService) {
 
 
-    $scope.model.title = "Macro picker";
+    if(!$scope.model.title) {
+        $scope.model.title = localizationService.localize("defaultdialogs_selectMacro");
+    }
+
     $scope.macros = [];
     $scope.model.selectedMacro = null;
     $scope.wizardStep = "macroSelect";

src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html

@@ -33,7 +33,7 @@
             <umb-empty-state
                 ng-if="noMacroParams"
                 position="center">
-                There are no parameters for this macro
+                <localize key="defaultdialogs_noMacroParams">There are no parameters for this macro</localize>
             </umb-empty-state>
 
         </div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js

@@ -1,7 +1,11 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Overlays.MediaPickerController",
-        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore) {
+        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore, localizationService) {
+
+            if(!$scope.model.title) {
+                $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
+            }
 
             var dialogOptions = $scope.model;
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html

@@ -12,7 +12,12 @@
 
          <div class="form-search">
             <i class="icon-search"></i>
-            <input class="umb-search-field search-query" ng-model="searchTerm" placeholder="Filter..." type="text">
+            <input
+                class="umb-search-field search-query"
+                ng-model="searchTerm"
+                localize="placeholder"
+                placeholder="@placeholders_filter"
+                type="text">
          </div>
 
          <div class="upload-button">
@@ -92,7 +97,9 @@
 
          <div ng-if="cropSize">
 
-            <h5>Preview</h5>
+            <h5>
+                <localize key="general_preview">Preview</localize>
+            </h5>
 
             <umb-image-thumbnail
                center="target.focalPoint"

src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js

@@ -1,6 +1,10 @@
 //used for the member picker dialog
 angular.module("umbraco").controller("Umbraco.Overlays.MemberGroupPickerController",
-    function($scope, eventsService, entityResource, searchService, $log) {
+    function($scope, eventsService, entityResource, searchService, $log, localizationService) {
+
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("defaultdialogs_selectMemberGroup");
+        }
 
         $scope.dialogTreeEventHandler = $({});
         $scope.multiPicker = $scope.model.multiPicker;

src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js

@@ -17,6 +17,10 @@
           searchText = value + "...";
       });
 
+      if(!$scope.model.title) {
+          $scope.model.title = localizationService.localize("actions_move");
+      }
+
       $scope.model.relateToOriginal = true;
       $scope.dialogTreeEventHandler = $({});
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js

@@ -23,10 +23,19 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
 
 			  if(contentType === "content") {
 				  entityType = "Document";
+				  if(!$scope.model.title) {
+					  $scope.model.title = localizationService.localize("defaultdialogs_selectContent");
+				  }
 			  } else if(contentType === "member") {
 				  entityType = "Member";
+				  if(!$scope.model.title) {
+					  $scope.model.title = localizationService.localize("defaultdialogs_selectMember");
+				  }
 			  } else if(contentType === "media") {
 				  entityType = "Media";
+				  if(!$scope.model.title) {
+					  $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
+				  }
 			  }
 		  }
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js

@@ -1,5 +1,5 @@
 angular.module("umbraco")
-    .controller("Umbraco.Overlays.UserController", function ($scope, $location, $timeout, userService, historyService, eventsService, externalLoginInfo, authResource, currentUserResource, formHelper) {
+    .controller("Umbraco.Overlays.UserController", function ($scope, $location, $timeout, userService, historyService, eventsService, externalLoginInfo, authResource, currentUserResource, formHelper, localizationService) {
 
         $scope.history = historyService.getCurrent();
         $scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion;
@@ -7,6 +7,10 @@ angular.module("umbraco")
         $scope.changePasswordButtonState = "init";
         $scope.model.subtitle = "Umbraco version" + " " + $scope.version;
 
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("general_user");
+        }
+
         $scope.externalLoginProviders = externalLoginInfo.providers;
         $scope.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl;
         var evts = [];

src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html

@@ -32,7 +32,9 @@
 
     <div class="umb-control-group external-logins" ng-if="externalLoginProviders.length > 0 && !showPasswordFields">
 
-        <h5>External login providers</h5>
+        <h5>
+            <localize key="defaultdialogs_externalLoginProviders">External login providers</localize>
+        </h5>
 
         <div ng-repeat="login in externalLoginProviders">
 
@@ -45,7 +47,7 @@
                         name="provider"
                         value="{{login.authType}}">
                     <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                    Link your {{login.caption}} account
+                    <localize key="defaultdialogs_linkYour">Link your</localize> {{login.caption}} <localize key="defaultdialogs_account">account</localize>
                 </button>
             </form>
 
@@ -57,7 +59,7 @@
                     name="provider"
                     value="{{login.authType}}">
                 <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                Un-link your {{login.caption}} account
+                <localize key="defaultdialogs_unLinkYour">Un-link your</localize> {{login.caption}} <localize key="defaultdialogs_account">account</localize>
             </button>
         </div>
 
@@ -76,7 +78,9 @@
 
     <div ng-show="showPasswordFields">
 
-       <h5>Change password</h5>
+       <h5>
+           <localize key="general_changePassword">Change password</localize>
+       </h5>
 
        <form
           name="passwordForm"

src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js

@@ -1,8 +1,8 @@
 angular.module("umbraco")
-    .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService) {
+    .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService, localizationService) {
 
-        if (!$scope.model.title) {
-            $scope.model.title = "Received an error from the server";
+        if(!$scope.model.title) {
+            $scope.model.title = localizationService.localize("errors_receivedErrorFromServer");
         }
 
         if ($scope.model.error && $scope.model.error.data && $scope.model.error.data.StackTrace) {

src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html

@@ -4,12 +4,16 @@
     <p>{{model.error.data.ExceptionMessage || model.error.data.Message}}</p>
 
     <div class="umb-control-group">
-        <h5>Exception Details: </h5>
+        <h5>
+            <localize key="defaultdialogs_exceptionDetail">Exception Details:</localize>
+        </h5>
         {{model.error.data.ExceptionType}}: {{model.error.data.ExceptionMessage}}
     </div>
 
     <div class="umb-control-group">
-        <h5>Stacktrace: </h5>
+        <h5>
+            <localize key="defaultdialogs_stacktrace">Stacktrace:</localize>
+        </h5>
         <pre style="white-space: pre-wrap; overflow-x: auto;">{{model.error.data.StackTrace}}</pre>
     </div>
 </div>

src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html

@@ -8,19 +8,25 @@
 
                <div class="umb-panel-header-icon" ng-if="!hideIcon" ng-click="openIconPicker()" ng-class="{'-placeholder': $parent.icon==='' || $parent.icon===null}">
                    <i class="icon {{$parent.icon}}"  ng-if="$parent.icon!=='' && $parent.icon!==null"></i>
-                   <div class="umb-panel-header-icon-text" ng-if="$parent.icon==='' || $parent.icon===null">Add icon</div>
+                   <div class="umb-panel-header-icon-text" ng-if="$parent.icon==='' || $parent.icon===null">
+                       <localize key="settings_addIcon"></localize>
+                   </div>
                </div>
 
                <div class="umb-panel-header-title-wrapper">
 
                    <ng-form name="headerNameForm">
-                       <input type="text" class="umb-panel-header-name-input" placeholder="Enter name..."
-                              name="headerName"
-                              ng-show="!nameLocked"
-                              ng-model="name"
-                              ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
-                              umb-auto-focus
-                              required />
+                       <input
+                        type="text"
+                        class="umb-panel-header-name-input"
+                        localize="placeholder"
+                        placeholder="@placeholders_entername"
+                        name="headerName"
+                        ng-show="!nameLocked"
+                        ng-model="name"
+                        ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
+                        umb-auto-focus
+                        required />
                    </ng-form>
 
                   <div class="umb-panel-header-name" ng-if="nameLocked">{{ name }}</div>
@@ -32,7 +38,13 @@
                                       enable-lock="true"
                                       server-validation-field="Alias"></umb-generate-alias>
 
-                  <input type="text" class="umb-panel-header-description" placeholder="Enter description..." ng-if="!hideDescription" ng-model="$parent.description" />
+                  <input
+                    type="text"
+                    class="umb-panel-header-description"
+                    localize="placeholder"
+                    placeholder="@placeholders_enterDescription"
+                    ng-if="!hideDescription"
+                    ng-model="$parent.description" />
 
                </div>
 

src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html

@@ -8,7 +8,9 @@
             <span class="umb-child-selector__child-name">
                 <strong>{{ parentName }}</strong>
             </span>
-            <small>(Current)</small>
+            <small>
+                (<localize key="general_current"></localize>)
+            </small>
         </div>
     </div>
 
@@ -27,7 +29,7 @@
         </div>
 
         <a href="" class="umb-child-selector__child -placeholder" ng-click="addChild($event)" hotkey="alt+shift+c">
-            <div class="umb-child-selector__child-name -blue"><strong>Add child</strong></div>
+            <div class="umb-child-selector__child-name -blue"><strong><localize key="shortcuts_addChild">Add Child</localize></strong></div>
         </a>
 
     </div>

src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html

@@ -29,7 +29,7 @@
 
     <umb-empty-state
        ng-if="!content">
-       There are no items to show
+       <localize key="content_noItemsToShow">There are no items to show</localize>
     </umb-empty-state>
 
 </div>

src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html

@@ -6,7 +6,7 @@
             <div class="umb-grid-selector__item-content">
                 <i class="umb-grid-selector__item-icon {{ defaultItem.icon }}"></i>
                 <div class="umb-grid-selector__item-label">{{ defaultItem.name }}</div>
-                <span class="umb-grid-selector__item-default-label">(Default {{itemLabel}})</span>
+                <span class="umb-grid-selector__item-default-label">(<localize key="general_default">Default</localize> {{itemLabel}})</span>
             </div>
             <i class="umb-grid-selector__item-remove icon-trash" ng-if="selectedItems.length === 1" ng-click="removeDefaultItem()"></i>
         </div>
@@ -15,22 +15,22 @@
             <div class="umb-grid-selector__item-content">
                 <i class="umb-grid-selector__item-icon {{ selectedItem.icon }}"></i>
                 <div class="umb-grid-selector__item-label">{{ selectedItem.name }}</div>
-                <a href="" class="umb-grid-selector__item-default-label -blue" ng-click="setAsDefaultItem(selectedItem)">Set as default</a>
+                <a href="" class="umb-grid-selector__item-default-label -blue" ng-click="setAsDefaultItem(selectedItem)"><localize key="grid_setAsDefault">Set as default</localize></a>
             </div>
             <i class="umb-grid-selector__item-remove icon-trash" ng-click="removeItem(selectedItem)"></i>
         </div>
 
         <a href="" class="umb-grid-selector__item -placeholder" ng-if="(availableItems | compareArrays:selectedItems:'alias').length > 0" ng-click="openItemPicker($event)" hotkey="alt+shift+t">
             <div class="umb-grid-selector__item-content">
-                <div class="umb-grid-selector__item-label -blue" ng-if="defaultItem !== null">Choose extra {{ itemLabel }}</div>
-                <div class="umb-grid-selector__item-label -blue" ng-if="defaultItem === null">Choose default {{ itemLabel }}</div>
+                <div class="umb-grid-selector__item-label -blue" ng-if="defaultItem !== null"><localize key="grid_chooseExtra">Choose extra</localize> {{ itemLabel }}</div>
+                <div class="umb-grid-selector__item-label -blue" ng-if="defaultItem === null"><localize key="grid_chooseDefault">Choose default</localize>{{ itemLabel }}</div>
             </div>
         </a>
 
     </div>
 
     <div class="text-center" ng-if="(availableItems | compareArrays:selectedItems:'alias').length === 0">
-        <small>All {{itemLabel}}s are added</small>
+        <small><localize key="general_all">Akk</localize> {{itemLabel}}s <localize key="grid_areAdded">are added</localize></small>
     </div>
 
     <umb-overlay

src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html

@@ -8,7 +8,7 @@
                 ng-if="compositions !== false"
                 type="button"
                 button-style="link"
-                label="Compositions"
+                label-key="contentTypeEditor_compositions"
                 icon="icon-merge"
                 action="openCompositionsDialog()">
             </umb-button>
@@ -17,7 +17,7 @@
                 ng-if="sorting !== false"
                 type="button"
                 button-style="link"
-                label="{{sortingButtonLabel}}"
+                label-key="{{sortingButtonKey}}"
                 icon="icon-navigation"
                 action="toggleSortingMode();">
             </umb-button>
@@ -26,7 +26,9 @@
 
     </umb-editor-sub-header>
 
-    <div ng-if="sortingMode && model.groups.length <= 1" class="umb-group-builder__no-data-text">You have not added any tabs to reorder</div>
+    <div ng-if="sortingMode && model.groups.length <= 1" class="umb-group-builder__no-data-text">
+        <localize key="contentTypeEditor_noTabs"></localize>
+    </div>
 
     <ul class="umb-group-builder__groups" ui-sortable="sortableOptionsGroup" ng-model="model.groups">
 
@@ -39,8 +41,8 @@
                   <div class="umb-group-builder__group-title -placeholder"></div>
                 </div>
 
-                <div ng-if="model.groups.length === 1">Add new tab</div>
-                <div ng-if="model.groups.length > 1">Add another tab</div>
+                <localize ng-if="model.groups.length === 1" key="contentTypeEditor_addNewTab"></localize>
+                <localize ng-if="model.groups.length > 1" key="contentTypeEditor_addAnotherTab"></localize>
 
             </a>
 
@@ -62,7 +64,10 @@
                     <ng-form name="groupNameForm">
                         <div class="umb-group-builder__group-title control-group -no-margin" ng-class="{'-active':tab.tabState=='active', '-inherited': tab.inherited}">
                             <i class="umb-group-builder__group-title-icon icon-navigation" ng-if="sortingMode && !tab.inherited"></i>
-                            <input class="umb-group-builder__group-title-input" type="text" placeholder="Enter name..."
+                            <input class="umb-group-builder__group-title-input"
+                                   type="text"
+                                   localize="placeholder"
+                                   placeholder="@placeholders_entername"
                                    name="groupName"
                                    ng-model="tab.name"
                                    ng-class="{'-placeholder': tab.name == ''}"
@@ -82,7 +87,9 @@
                     <input type="number" class="umb-group-builder__group-sort-value" ng-if="sortingMode" ng-model="tab.sortOrder" ng-disabled="tab.inherited" on-blur="changeSortOrderValue()" />
 
                     <div class="umb-group-builder__group-inherited-label" ng-if="tab.inherited">
-                        <i class="icon icon-merge"></i> Inherited from {{ tab.inheritedFromName }}
+                        <i class="icon icon-merge"></i>
+                        <localize key="contentTypeEditor_inheritedFrom"></localize> {{ tab.inheritedFromName }}
+
                         <span ng-repeat="contentTypeName in tab.parentTabContentTypeNames">
                             {{ contentTypeName }}
                             <span ng-if="!$last">, </span>
@@ -109,7 +116,7 @@
                             </div>
 
                             <div class="umb-group-builder__property-preview umb-group-builder__placeholder-box">
-                                <div>Add property</div>
+                                <localize key="contentTypeEditor_addProperty"></localize>
                             </div>
 
                             <div class="umb-group-builder__property-actions"></div>
@@ -122,7 +129,7 @@
                             <div class="umb-group-builder__property-meta" ng-class="{'-full-width': sortingMode}">
 
                                 <div class="umb-group-builder__property-inherited-label" ng-if="property.inherited">
-                                    <i class="icon icon-merge"></i> Inherited from {{property.contentTypeName}}
+                                    <i class="icon icon-merge"></i> <localize key="contentTypeEditor_inheritedFrom"></localize> {{property.contentTypeName}}
                                 </div>
 
                                 <div class="umb-group-builder__property-locked-label" ng-if="property.locked">
@@ -133,26 +140,38 @@
                                     <div class="control-group -no-margin" ng-if="!sortingMode">
 
                                         <div class="umb-group-builder__property-meta-alias" ng-if="property.inherited || property.locked">{{ property.alias }}</div>
-                                        <umb-locked-field ng-if="!property.inherited && !property.locked"
-                                                          locked="locked"
-                                                          ng-model="property.alias"
-                                                          placeholder-text="'Alias...'"
-                                                          server-validation-field="{{'Groups[' + $parent.$parent.$parent.$parent.$index + '].Properties[' + $index + '].Alias'}}">
+                                        <umb-locked-field
+                                            ng-if="!property.inherited && !property.locked"
+                                            locked="locked"
+                                            ng-model="property.alias"
+                                            placeholder-text="'Alias...'"
+                                            server-validation-field="{{'Groups[' + $parent.$parent.$parent.$parent.$index + '].Properties[' + $index + '].Alias'}}">
                                         </umb-locked-field>
 
                                         <div class="umb-group-builder__property-meta-label">
-                                            <textarea placeholder="Label..." ng-model="property.label" ng-disabled="property.inherited || property.locked"
-                                                      name="groupName"
-                                                      umb-auto-resize
-                                                      required
-                                                      val-server-field="{{'Groups[' + $parent.$parent.$parent.$parent.$index + '].Properties[' + $index + '].Label'}}"></textarea>
+                                            <textarea
+                                                localize="placeholder"
+                                                placeholder="@placeholders_label"
+                                                ng-model="property.label"
+                                                ng-disabled="property.inherited || property.locked"
+                                                name="groupName"
+                                                umb-auto-resize
+                                                required
+                                                val-server-field="{{'Groups[' + $parent.$parent.$parent.$parent.$index + '].Properties[' + $index + '].Label'}}">
+                                            </textarea>
 
                                             <div class="umb-validation-label" val-msg-for="groupName" val-toggle-msg="valServerField"></div>
-                                            <div class="umb-validation-label" val-msg-for="groupName" val-toggle-msg="required">Required label</div>
+                                            <div class="umb-validation-label" val-msg-for="groupName" val-toggle-msg="required"><localize key="contentTypeEditor_requiredLabel"></localize></div>
                                         </div>
 
                                         <div class="umb-group-builder__property-meta-description">
-                                            <textarea ng-model="property.description" placeholder="Enter your description..." ng-disabled="property.inherited || property.locked" umb-auto-resize></textarea>
+                                            <textarea
+                                                localize="placeholder"
+                                                placeholder="@placeholders_enterDescription"
+                                                ng-model="property.description"
+                                                ng-disabled="property.inherited || property.locked"
+                                                umb-auto-resize>
+                                            </textarea>
                                         </div>
                                     </div>
                                 </ng-form>
@@ -172,7 +191,7 @@
 
                                 <span class="umb-group-builder__property-preview-label">
                                     <span ng-if="property.dataTypeName !== undefined">{{property.dataTypeName}}</span>
-                                    <span ng-if="property.dataTypeName == undefined">Preview</span>
+                                    <span ng-if="property.dataTypeName == undefined"><localize key="general_preview"></localize></span>
                                 </span>
 
                                 <ng-form name="propertyEditorPreviewForm" umb-disable-form-validation>

src/Umbraco.Web.UI.Client/src/views/components/umb-keyboard-shortcuts-overview.html

@@ -1,7 +1,7 @@
 <div class="umb-keyboard-shortcuts-overview">
 
   <div class="umb-keyboard-shortcuts-overview__keyboard-shortcut -no-air -no-stroke" data-hotkey="alt+shift+k" ng-click="toggleShortcutsOverlay()">
-    <div class="umb-keyboard-shortcuts-overview__description">show shortcuts</div>
+    <div class="umb-keyboard-shortcuts-overview__description"><localize key="shortcuts_showShortcuts">show shortcuts</localize></div>
     <div class="umb-keyboard-keys">
       <div class="umb-keyboard-key-wrapper">
         <div class="umb-keyboard-key">alt</div>

src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html

@@ -2,8 +2,8 @@
 
   <div class="umb-list-view-settings__trigger">
     <label class="checkbox no-indent">
-        <input type="checkbox" ng-model="enableListView" hotkey="alt+shift+l" /> Yes - enable list view
-    </label>
+        <input type="checkbox" ng-model="enableListView" hotkey="alt+shift+l" />
+        <localize key="general_yes"></localize> - <localize key="contentTypeEditor_enableListViewHeading"></localize>
   </div>
 
   <!-- list view enabled -->
@@ -14,11 +14,11 @@
             <i class="umb-list-view-settings__list-view-icon icon-list"></i>
             <div>
                 <div>
-                    <div class="umb-list-view-settings__name">{{ dataType.name }} <em ng-if="!customListViewCreated">(default)</em></div>
+                    <div class="umb-list-view-settings__name">{{ dataType.name }} <em ng-if="!customListViewCreated">(<localize key="general_default">default</localize>)</em></div>
                     <a href="" ng-click="toggleEditListViewDataTypeSettings()"><i class="umb-list-view-settings__settings-icon icon-settings"></i></a>
                 </div>
-                <a href="" class="umb-list-view-settings__create-new" ng-if="!customListViewCreated" ng-click="createCustomListViewDataType()">Create custom list view</a>
-                <a href="" class="umb-list-view-settings__remove-new" ng-if="customListViewCreated" ng-click="removeCustomListDataType()">Remove custom list view</a>
+                <a href="" class="umb-list-view-settings__create-new" ng-if="!customListViewCreated" ng-click="createCustomListViewDataType()"><localize key="editcontenttype_createListView">Create custom list view</localize></a>
+                <a href="" class="umb-list-view-settings__remove-new" ng-if="customListViewCreated" ng-click="removeCustomListDataType()"><localize key="editcontenttype_removeListView">Remove custom list view</localize></a>
             </div>
         </div>
 
@@ -31,8 +31,8 @@
             <umb-editor model="preValue" is-pre-value="true"></umb-editor>
         </umb-property>
 
-        <button type="button" class="btn" ng-click="toggleEditListViewDataTypeSettings()">Close</button>
-        <button type="button" class="btn btn-success" ng-click="saveListViewDataType()">Save list view</button>
+        <button type="button" class="btn" ng-click="toggleEditListViewDataTypeSettings()"><localize key="general_close">Close</localize></button>
+        <button type="button" class="btn btn-success" ng-click="saveListViewDataType()"><localize key="buttons_saveListView"></localize></button>
 
     </div>
   </div>

src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html

@@ -25,8 +25,8 @@
 
    </div>
 
-   <div class="umb-validation-label" val-msg-for="lockedField" val-toggle-msg="required">Required alias</div>
-   <div ng-if="regexValidation.length > 0" class="umb-validation-label" val-msg-for="lockedField" val-toggle-msg="valRegex">Invalid alias</div>
+   <div class="umb-validation-label" val-msg-for="lockedField" val-toggle-msg="required"><localize key="general_required">Required</localize> <localize key="content_alias">alias</localize></div>
+   <div ng-if="regexValidation.length > 0" class="umb-validation-label" val-msg-for="lockedField" val-toggle-msg="valRegex"><localize key="general_invalid">Invalid</localize> <localize key="content_alias">alias</localize></div>
    <div ng-if="serverValidationField.length > 0" class="umb-validation-label" val-msg-for="lockedField" val-toggle-msg="valServerField"></div>
 
 </ng-form>

src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html

@@ -30,7 +30,7 @@
                  ngf-multiple="true"
                  ngf-pattern="{{ accept }}"
                  ngf-max-size="{{ maxFileSize }}">
-                - or click here to choose files
+                - <localize key="media_orClickHereToUpload">or click here to choose files</localize>
             </div>
         </div>
     </div>
@@ -78,8 +78,8 @@
                <strong>{{ file.name }}</strong>
 
                <span class="file-error" ng-if="file.$error">
-                  <span ng-if="file.$error === 'pattern'" class="errorMessage color-red">(Only allowed file types are: "{{ accept }}")</span>
-                  <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red">(Max file size is "{{maxFileSize}}")</span>
+                  <span ng-if="file.$error === 'pattern'" class="errorMessage color-red">(<localize key="media_onlyAllowedFiles"></localize>: "{{ accept }}")</span>
+                  <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red">(<localize key="media_maxFileSize"></localize> "{{maxFileSize}}")</span>
                </span>
 
                <span class="file-error" ng-if="file.serverErrorMessage">

src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js

@@ -6,21 +6,26 @@
  * @description
  * The controller for the doc type creation dialog
  */
-function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState, notificationsService) {
+function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState, notificationsService, localizationService) {
 
     $scope.model = {
         folderName: "",
-        creatingFolder: false,        
+        creatingFolder: false,
     };
 
-    var node = $scope.dialogOptions.currentNode;
+    var node = $scope.dialogOptions.currentNode,
+        localizeCreateFolder = localizationService.localize("defaultdialog_createFolder");
 
     $scope.showCreateFolder = function() {
         $scope.model.creatingFolder = true;
     }
 
     $scope.createContainer = function () {
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: "Creating folder..." })) {
+        if (formHelper.submitForm({
+            scope: $scope,
+            formCtrl: this.createFolderForm,
+            statusMessage: localizeCreateFolder
+        })) {
             contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
 
                 navigationService.hideMenu();
@@ -29,8 +34,8 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
 
                 formHelper.resetForm({ scope: $scope });
 
-                var section = appState.getSectionState("currentSection"); 
-                
+                var section = appState.getSectionState("currentSection");
+
             }, function(err) {
 
                 $scope.error = err;

src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html

@@ -17,15 +17,13 @@
             <li>
               <a href="" ng-click="createComponent()">
                 <i class="large icon-item-arrangement"></i>
-                <span class="menu-label">
-                    Document Type Without Template
-                </span>
+                <span class="menu-label"><localize key="create_documentTypeWithoutTemplate"></localize></span>
               </a>
             </li>
             <li>
                 <a href="" ng-click="showCreateFolder()">
                     <i class="large icon-folder"></i>
-                    <span class="menu-label">Folder</span>
+                    <span class="menu-label"><localize key="general_folder"></localize></span>
                 </a>
             </li>
         </ul>

src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html

@@ -17,15 +17,20 @@
 
             <div ng-switch-default>
                 <p>
-                	<i class="icon-alert red"></i> <strong class="red">All Documents</strong>
-                    using this document type will be deleted permanently, please confirm you want to delete these as well.
+                	<i class="icon-alert red"></i>
+                    <strong class="red">
+                        <localize key="contentTypeEditor_allDocuments">All Documents</localize>
+                    </strong>
+                    <localize key="contentTypeEditor_usingThisDocument">
+                        using this document type will be deleted permanently, please confirm you want to delete these as well.
+                    </localize>
                 </p>
 
                 <hr />
 
                 <label class="checkbox">
                 	<input type="checkbox" ng-model="confirmed" />
-                    Yes, delete {{currentNode.name}} and all documents using this type
+                    <localize key="contentTypeEditor_yesDelete">Yes, delete</localize> {{currentNode.name}} <localize key="contentTypeEditor_andAllDocuments">and all documents using this type</localize>
                 </label>
 
                 <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">

src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js

@@ -12,6 +12,7 @@
         function DocumentTypesEditController($scope, $routeParams, modelsResource, contentTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter, $q, localizationService, overlayHelper) {
 
         var vm = this;
+        var localizeSaving = localizationService.localize("general_saving");
 
         vm.save = save;
 
@@ -22,23 +23,23 @@
         vm.page.saveButtonState = "init";
         vm.page.navigation = [
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design"),
 			    "icon": "icon-document-dashed-line",
 			    "view": "views/documenttypes/views/design/design.html",
 			    "active": true
 			},
 			{
-			    "name": "List view",
+			    "name": localizationService.localize("general_listView"),
 			    "icon": "icon-list",
 			    "view": "views/documenttypes/views/listview/listview.html"
 			},
 			{
-			    "name": "Permissions",
+			    "name": localizationService.localize("general_rights"),
 			    "icon": "icon-keychain",
 			    "view": "views/documenttypes/views/permissions/permissions.html"
 			},
 			{
-			    "name": "Templates",
+			    "name": localizationService.localize("treeHeaders_templates"),
 			    "icon": "icon-layout",
 			    "view": "views/documenttypes/views/templates/templates.html"
 			}
@@ -46,63 +47,63 @@
 
         vm.page.keyboardShortcutsOverview = [
 			{
-			    "name": "Sections",
+			    "name": localizationService.localize("main_sections"),
 			    "shortcuts": [
 					{
-					    "description": "Navigate sections",
+					    "description": localizationService.localize("shortcuts_navigateSections"),
 					    "keys": [{ "key": "1" }, { "key": "4" }],
 					    "keyRange": true
 					}
 			    ]
 			},
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design"),
 			    "shortcuts": [
 				{
-				    "description": "Add tab",
+				    "description": localizationService.localize("shortcuts_addTab"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
 				},
 				{
-				    "description": "Add property",
+				    "description": localizationService.localize("shortcuts_addProperty"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
 				},
 				{
-				    "description": "Add editor",
+				    "description": localizationService.localize("shortcuts_addEditor"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
 				},
 				{
-				    "description": "Edit data type",
+				    "description": localizationService.localize("shortcuts_editDataType"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
 				}
 			    ]
 			},
 		{
-		    "name": "List view",
+		    "name": localizationService.localize("general_listView"),
 		    "shortcuts": [
 				{
-				    "description": "Toggle list view",
+				    "description": localizationService.localize("shortcuts_toggleListView"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }]
 				}
 		    ]
 		},
 		{
-		    "name": "Permissions",
+		    "name": localizationService.localize("general_rights"),
 		    "shortcuts": [
 				{
-				    "description": "Toggle allow as root",
+				    "description": localizationService.localize("shortcuts_toggleAllowAsRoot"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }]
 				},
 				{
-				    "description": "Add child node",
+				    "description": localizationService.localize("shortcuts_addChildNode"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }]
 				}
 		    ]
 		},
 		{
-		    "name": "Templates",
+		    "name": localizationService.localize("treeHeaders_templates"),
 		    "shortcuts": [
 				{
-				    "description": "Add template",
+				    "description": localizationService.localize("shortcuts_addTemplate"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
 				}
 		    ]
@@ -151,7 +152,7 @@
                 vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes);
 
                 contentEditingHelper.contentEditorPerformSave({
-                    statusMessage: "Saving...",
+                    statusMessage: localizeSaving,
                     saveMethod: contentTypeResource.save,
                     scope: $scope,
                     content: vm.contentType,

src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html

@@ -4,7 +4,7 @@
         <div class="umb-pane">
 
             <p class="abstract" ng-hide="success">
-                Select the folder to move <strong>{{currentNode.name}}</strong>&nbsp;to in the tree structure below
+                <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{currentNode.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
             <div class="umb-loader-wrapper" ng-show="busy">
@@ -17,7 +17,8 @@
             </div>
 
             <div ng-show="success">
-                <h5 class="text-success"><strong>{{currentNode.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong></h5>
+                <h5 class="text-success">
+                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong></h5>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
 

src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html

@@ -1,10 +1,8 @@
 <div class="sub-view-columns">
 
     <div class="sub-view-column-left">
-
-        <h5>Enable list view</h5>
-        <small>Configures the content item to show a sortable & searchable list of its children, the children will not be shown in the tree</small>
-
+        <h5><localize key="contentTypeEditor_enableListViewHeading" /></h5>
+        <small><localize key="contentTypeEditor_enableListViewDescription" /></small>
     </div>
 
     <div class="sub-view-column-right">

src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js

@@ -30,7 +30,7 @@
 
         function init() {
 
-            childNodeSelectorOverlayTitle = localizationService.localize("contentTypeEditor_chooseChildNode").then(function (value) {return value;});
+            childNodeSelectorOverlayTitle = localizationService.localize("contentTypeEditor_chooseChildNode");
 
             contentTypeResource.getAll().then(function(contentTypes){
 

src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html

@@ -1,8 +1,8 @@
 <div class="sub-view-columns" ng-controller="Umbraco.Editors.DocumentType.TemplatesController as vm">
 
     <div class="sub-view-column-left">
-        <h5>Allowed Templates</h5>
-        <small>Choose which templates editors are allowed to use on content of this type</small>
+        <h5><localize key="contentTypeEditor_allowedTemplatesHeading" /></h5>
+        <small><localize key="contentTypeEditor_allowedTemplatesDescription" /></small>
     </div>
 
     <div class="sub-view-column-right">

src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js

@@ -6,21 +6,26 @@
  * @description
  * The controller for the media type creation dialog
  */
-function MediaTypesCreateController($scope, $location, navigationService, mediaTypeResource, formHelper, appState) {
+function MediaTypesCreateController($scope, $location, navigationService, mediaTypeResource, formHelper, appState, localizationService) {
 
     $scope.model = {
         folderName: "",
         creatingFolder: false
     };
 
-    var node = $scope.dialogOptions.currentNode;
+    var node = $scope.dialogOptions.currentNode,
+        localizeCreateFolder = localizationService.localize("defaultdialog_createFolder");
 
     $scope.showCreateFolder = function() {
         $scope.model.creatingFolder = true;
     }
 
     $scope.createContainer = function () {
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: "Creating folder..." })) {
+        if (formHelper.submitForm({
+            scope: $scope,
+            formCtrl: this.createFolderForm,
+            statusMessage: localizeCreateFolder
+        })) {
             mediaTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
 
                 navigationService.hideMenu();

src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html

@@ -18,12 +18,8 @@
             </li>
             <li>
                 <a href="" ng-click="showCreateFolder()">
-
                     <i class="large icon-folder"></i>
-
-                    <span class="menu-label">
-                        Folder
-                    </span>
+                    <span class="menu-label"><localize key="general_folder"></localize></span>
                 </a>
             </li>
         </ul>

src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html

@@ -15,15 +15,18 @@
 
             <div ng-switch-default>
                 <p>
-                	<i class="icon-alert red"></i> <strong class="red">All media items</strong>
-                    using this media type will be deleted permanently, please confirm you want to delete these as well.
+                	<i class="icon-alert red"></i>
+                    <strong class="red">
+                        <localize key="contentTypeEditor_allMediaItems">All media items</localize>
+                    </strong>
+                    <localize key="contentTypeEditor_usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</localize>
                 </p>
 
                 <hr />
 
                 <label class="checkbox">
                 	<input type="checkbox" ng-model="confirmed" />
-                    Yes, delete {{currentNode.name}} and all media items using this type
+                    <localize key="contentTypeEditor_yesDelete">Yes, delete</localize> {{currentNode.name}} <localize key="contentTypeEditor_andAllMediaItems">and all media items using this type</localize>
                 </label>
 
                 <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">

src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js

@@ -11,6 +11,7 @@
 
     function MediaTypesEditController($scope, $routeParams, mediaTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter, $q, localizationService, overlayHelper) {
         var vm = this;
+        var localizeSaving = localizationService.localize("general_saving");
 
         vm.save = save;
 
@@ -21,18 +22,18 @@
         vm.page.saveButtonState = "init";
         vm.page.navigation = [
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design"),
 			    "icon": "icon-document-dashed-line",
 			    "view": "views/mediatypes/views/design/design.html",
 			    "active": true
 			},
 			{
-			    "name": "List view",
+			    "name": localizationService.localize("general_listView"),
 			    "icon": "icon-list",
 			    "view": "views/mediatypes/views/listview/listview.html"
 			},
 			{
-			    "name": "Permissions",
+			    "name": localizationService.localize("general_rights"),
 			    "icon": "icon-keychain",
 			    "view": "views/mediatypes/views/permissions/permissions.html"
 			}
@@ -40,54 +41,54 @@
 
         vm.page.keyboardShortcutsOverview = [
 			{
-			    "name": "Sections",
+			    "name": localizationService.localize("main_sections"),
 			    "shortcuts": [
 					{
-					    "description": "Navigate sections",
+					    "description": localizationService.localize("shortcuts_navigateSections"),
 					    "keys": [{ "key": "1" }, { "key": "3" }],
 					    "keyRange": true
 					}
 			    ]
 			},
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design"),
 			    "shortcuts": [
 				{
-				    "description": "Add tab",
+				    "description": localizationService.localize("shortcuts_addTab"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
 				},
 				{
-				    "description": "Add property",
+				    "description": localizationService.localize("shortcuts_addProperty"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
 				},
 				{
-				    "description": "Add editor",
+				    "description": localizationService.localize("shortcuts_addEditor"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
 				},
 				{
-				    "description": "Edit data type",
+				    "description": localizationService.localize("shortcuts_editDataType"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
 				}
 			    ]
 			},
 		{
-		    "name": "List view",
+		    "name": localizationService.localize("general_listView"),
 		    "shortcuts": [
 				{
-				    "description": "Toggle list view",
+				    "description": localizationService.localize("shortcuts_toggleListView"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }]
 				}
 		    ]
 		},
 		{
-		    "name": "Permissions",
+		    "name": localizationService.localize("general_rights"),
 		    "shortcuts": [
 				{
-				    "description": "Toggle allow as root",
+				    "description": localizationService.localize("shortcuts_toggleAllowAsRoot"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }]
 				},
 				{
-				    "description": "Add child node",
+				    "description": localizationService.localize("shortcuts_addChildNode"),
 				    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }]
 				}
 		    ]
@@ -132,7 +133,7 @@
                 vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes);
 
                 contentEditingHelper.contentEditorPerformSave({
-                    statusMessage: "Saving...",
+                    statusMessage: localizeSaving,
                     saveMethod: mediaTypeResource.save,
                     scope: $scope,
                     content: vm.contentType,

src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html

@@ -1,10 +1,10 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MediaTypes.MoveController">
-    
+
     <div class="umb-dialog-body">
         <div class="umb-pane">
 
             <p class="abstract" ng-hide="success">
-                Select the folder to move <strong>{{currentNode.name}}</strong>&nbsp;to in the tree structure below
+                    <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{currentNode.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
             <div class="umb-loader-wrapper" ng-show="busy">
@@ -17,7 +17,7 @@
             </div>
 
             <div ng-show="success">
-                <h5 class="text-success"><strong>{{currentNode.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong></h5>
+                <h5 class="text-success"><strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong></h5>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
 

src/Umbraco.Web.UI.Client/src/views/mediatypes/views/listview/listview.html

@@ -1,10 +1,8 @@
 <div class="sub-view-columns">
 
     <div class="sub-view-column-left">
-
-        <h5>Enable list view</h5>
-        <small>Configures the content item to show a sortable & searchable list of its children, the children will not be shown in the tree</small>
-
+        <h5><localize key="contentTypeEditor_enableListViewHeading" /></h5>
+        <small><localize key="contentTypeEditor_enableListViewDescription" /></small>
     </div>
 
     <div class="sub-view-column-right">

src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js

@@ -20,7 +20,7 @@
 
         function init() {
 
-            childNodeSelectorOverlayTitle = localizationService.localize("contentTypeEditor_chooseChildNode").then(function (value) {return value;});
+            childNodeSelectorOverlayTitle = localizationService.localize("contentTypeEditor_chooseChildNode");
 
             mediaTypeResource.getAll().then(function(mediaTypes){
 

src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js

@@ -6,21 +6,27 @@
  * @description
  * The controller for the member type creation dialog
  */
-function MemberTypesCreateController($scope, $location, navigationService, memberTypeResource, formHelper, appState) {
+function MemberTypesCreateController($scope, $location, navigationService, memberTypeResource, formHelper, appState, localizationService) {
 
     $scope.model = {
         folderName: "",
         creatingFolder: false
     };
 
-    var node = $scope.dialogOptions.currentNode;
+    var node = $scope.dialogOptions.currentNode,
+        localizeCreateFolder = localizationService.localize("defaultdialog_createFolder");
+
 
     $scope.showCreateFolder = function() {
         $scope.model.creatingFolder = true;
     }
 
     $scope.createContainer = function () {
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: "Creating folder..." })) {
+        if (formHelper.submitForm({
+            scope: $scope,
+            formCtrl: this.createFolderForm,
+            statusMessage: localizeCreateFolder
+        })) {
             memberTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
 
                 navigationService.hideMenu();

src/Umbraco.Web.UI.Client/src/views/membertypes/create.html

@@ -6,12 +6,8 @@
         <ul class="umb-actions umb-actions-child">
             <li>
                 <a href="" ng-click="showCreateFolder()">
-
                     <i class="large icon-folder"></i>
-
-                    <span class="menu-label">
-                        Folder
-                    </span>
+                    <span class="menu-label"><localize key="general_folder"></localize></span>
                 </a>
             </li>
             <li>

src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html

@@ -2,19 +2,20 @@
     <div class="umb-dialog-body">
 
         <p class="umb-abstract">
-        	Are you sure you want to delete <strong>{{currentNode.name}}</strong> ?
+        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
         </p>
 
         <p>
-            <i class="icon-alert red"></i> <strong class="red">All members</strong>
-            using this member type will be deleted permanently, please confirm you want to delete these as well.
+            <i class="icon-alert red"></i>
+            <strong class="red"><localize key="member_allMembers">All members</localize></strong>
+            <localize key="contentTypeEditor_usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well.</localize>
         </p>
 
         <hr />
 
         <label class="checkbox">
             <input type="checkbox" ng-model="confirmed" />
-            Yes, delete {{currentNode.name}} and all members using this type
+            <localize key="contentTypeEditor_yesDelete">Yes, delete</localize> {{currentNode.name}} <localize key="contentTypeEditor_andAllMembers">and all members using this type</localize>
         </label>
 
         <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">

src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js

@@ -12,6 +12,7 @@
     function MemberTypesEditController($scope, $rootScope, $routeParams, $log, $filter, memberTypeResource, dataTypeResource, editorState, iconHelper, formHelper, navigationService, contentEditingHelper, notificationsService, $q, localizationService, overlayHelper) {
 
         var vm = this;
+        var localizeSaving = localizationService.localize("general_saving");
 
         vm.save = save;
 
@@ -22,7 +23,7 @@
         vm.page.saveButtonState = "init";
         vm.page.navigation = [
 			{
-			    "name": "Design",
+			    "name": localizationService.localize("general_design"),
 			    "icon": "icon-document-dashed-line",
 			    "view": "views/membertypes/views/design/design.html",
 			    "active": true
@@ -31,21 +32,22 @@
 
         vm.page.keyboardShortcutsOverview = [
 			{
+                "name": localizationService.localize("shortcuts_shortcut"),
 			    "shortcuts": [
 					{
-					    "description": "Add tab",
+					    "description": localizationService.localize("shortcuts_addTab"),
 					    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
 					},
 					{
-					    "description": "Add property",
+					    "description": localizationService.localize("shortcuts_addProperty"),
 					    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
 					},
 					{
-					    "description": "Add editor",
+					    "description": localizationService.localize("shortcuts_addEditor"),
 					    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
 					},
 					{
-					    "description": "Edit data type",
+					    "description": localizationService.localize("shortcuts_editDataType"),
 					    "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
 					}
 			    ]
@@ -86,7 +88,7 @@
                 vm.page.saveButtonState = "busy";
 
                 contentEditingHelper.contentEditorPerformSave({
-                    statusMessage: "Saving...",
+                    statusMessage: localizeSaving,
                     saveMethod: memberTypeResource.save,
                     scope: $scope,
                     content: vm.contentType,

src/Umbraco.Web.UI.Client/src/views/membertypes/move.html

@@ -3,7 +3,7 @@
     <div class="umb-dialog-body">
 
         <p class="umb-abstract">
-        	Select the folder to move {{currentNode.name}} to.
+        	<localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> {{currentNode.name}} <localize key="general_to">to</localize>.
         </p>
 
 

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js

@@ -240,7 +240,7 @@ angular.module("umbraco")
           $scope.editorOverlay = {
               view: "itempicker",
               filter: false,
-              title: localizationService.localize("grid_insertControl").then(function (value) {return value;}),
+              title: localizationService.localize("grid_insertControl"),
               availableItems: area.$allowedEditors,
               event: event,
               show: true,

src/Umbraco.Web.UI/config/metablogConfig.config

@@ -5,7 +5,7 @@
     <user>0</user>
     <startNode>1080</startNode>
     <fullTree>False</fullTree>
-    <documentTypeAlias>pup</documentTypeAlias>
+    <documentTypeAlias>Articulate</documentTypeAlias>
     <fields>
       <categories>
       </categories>

src/Umbraco.Web.UI/config/trees.config

@@ -3,22 +3,19 @@
   <!--Content-->
   <add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, umbraco" />
   <add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, umbraco" />
-  
   <!--Media-->
   <add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, umbraco" />
   <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" />
-  
   <!--Settings-->
   <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
   <add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />  
+  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
   <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
   <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
   <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
   <add initialize="true" sortOrder="7" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
-  
   <!--Developer-->
   <add initialize="true" sortOrder="0" alias="dataTypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
   <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
@@ -27,23 +24,21 @@
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" />
   <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
-  
   <!--Users-->
   <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
   <add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
   <add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
-  
   <!--Members-->
   <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
   <add initialize="true" sortOrder="1" alias="memberTypes" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" />
   <add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" />
-
   <!--Translation-->
   <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" />
   <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" />
-  
   <!-- Custom -->
   <!--<add application="myApplication" alias="myTree" title="Me Tree" type="MyNamespace.myTree, MyAssembly"
        iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="10" />-->
-  
+  <add initialize="true" sortOrder="2" alias="datasource" application="forms" title="Datasources" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.DataSourceTreeController, Umbraco.Forms.Web" />
+  <add initialize="true" sortOrder="0" alias="form" application="forms" title="Forms" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.FormTreeController, Umbraco.Forms.Web" />
+  <add initialize="true" sortOrder="3" alias="prevaluesource" application="forms" title="Prevalue sources" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.PreValueSourceTreeController, Umbraco.Forms.Web" />
 </trees>

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

@@ -84,6 +84,7 @@
     <key alias="save">Gem</key>
     <key alias="saveAndPublish">Gem og udgiv</key>
     <key alias="saveToPublish">Gem og send til udgivelse</key>
+    <key alias="saveListView">Gem listevisning</key>
     <key alias="showPage">Se siden</key>
     <key alias="showPageDisabled">Preview er deaktiveret fordi der ikke er nogen skabelon tildelt</key>
     <key alias="styleChoose">Vælg formattering</key>
@@ -175,6 +176,7 @@
     <key alias="updateData">Vælg en type og skriv en titel</key>
     <key alias="noDocumentTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte dokument typer. Du skal tillade disse i indstillinger under <strong>"dokument typer"</strong>.]]></key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte media typer. Du skal tillade disse i indstillinger under <strong>"media typer"</strong>.]]></key>
+    <key alias="documentTypeWithoutTemplate">Dokument type uden skabelon</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Til dit website</key>
@@ -240,6 +242,8 @@
     <key alias="password">Indtast dit kodeord</key>
     <key alias="nameentity">Navngiv %0%...</key>
     <key alias="entername">Indtast navn...</key>
+    <key alias="label">Label...</key>
+    <key alias="enterDescription">Indtast beskrivelse</key>
     <key alias="search">Søg...</key>
     <key alias="filter">Filtrer...</key>
     <key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
@@ -289,7 +293,8 @@
     <key alias="errorRegExpWithoutTab">%0% er ikke i et korrekt format</key>
   </area>
   <area alias="errors">
-	<key alias="dissallowedMediaType">Denne filttype er blevet deaktiveret af administratoren</key>
+    <key alias="receivedErrorFromServer">Der skete en fejl på severen</key>
+	  <key alias="dissallowedMediaType">Denne filttype er blevet deaktiveret af administratoren</key>
     <key alias="codemirroriewarning">OBS! Selvom CodeMirror er slået til i konfigurationen, så er den deaktiveret i Internet Explorer fordi den ikke er stabil nok.</key>
     <key alias="contentTypeAliasAndNameNotNull">Du skal udfylde både Alias &amp; Navn på den nye egenskabstype!</key>
     <key alias="filePermissionsError">Der mangler læse/skrive rettigheder til bestemte filer og mapper</key>
@@ -389,7 +394,7 @@
     <key alias="showPageOnSend">Hvilken side skal vises efter at formularen er sendt</key>
     <key alias="size">Størrelse</key>
     <key alias="sort">Sortér</key>
-    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
+    <key alias="submit">Indsend</key> <!-- TODO: Translate this -->
     <key alias="type">Type</key>
     <key alias="typeToSearch">Skriv for at søge...</key>
     <key alias="up">Op</key>
@@ -406,9 +411,46 @@
     <key alias="yes">Ja</key>
     <key alias="folder">Mappe</key>
     <key alias="searchResults">Søgeresultater</key>
-    <key alias="reorder">Reorder</key>
-    <key alias="reorderDone">I am done reordering</key>
+    <key alias="reorder">Sorter</key>
+    <key alias="reorderDone">Afslut sortering</key>
+    <key alias="preview">Eksempel</key>
+    <key alias="changePassword">Skift kodeord</key>
+    <key alias="to">til</key>
+    <key alias="listView">Listevisning</key>
+    <key alias="saving">Gemmer...</key>
+    <key alias="current">nuværende</key>
+    <key alias="move">Flyt</key>
+    <key alias="embed">Indlejring</key>
   </area>
+
+  <area alias="colors">
+    <key alias="black">Sort</key>
+    <key alias="green">Grøn</key>
+    <key alias="yellow">Gul</key>
+    <key alias="orange">Orange</key>
+    <key alias="blue">Blå</key>
+    <key alias="red">Rød</key>
+  </area>
+
+  <area alias="shortcuts">
+      <key alias="addTab">Tilføj fane</key>
+      <key alias="addProperty">Tilføj property</key>
+      <key alias="addEditor">Tilføj editor</key>
+      <key alias="addTemplate">Tilføj skabelon</key>
+      <key alias="addChildNode">Tilføj child node</key>
+      <key alias="addChild">Tilføj child</key>
+
+      <key alias="editDataType">Rediger data type</key>
+
+      <key alias="navigateSections">Naviger sektioner</key>
+
+      <key alias="shortcut">Genveje</key>
+      <key alias="showShortcuts">Vis genveje</key>
+
+      <key alias="toggleListView">Brug listevisning</key>
+      <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
+  </area>
+
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Baggrundsfarve</key>
     <key alias="bold">Fed</key>
@@ -495,14 +537,14 @@
   </area>
   <area alias="login">
 
-    <key alias="greeting0">Så er det søndag!</key>  
+    <key alias="greeting0">Så er det søndag!</key>
     <key alias="greeting1">Smil, det er mandag!</key>
     <key alias="greeting2">Hurra, det er tirsdag!</key>
     <key alias="greeting3">Hvilken herlig onsdag!</key>
     <key alias="greeting4">Glædelig torsdag!</key>
     <key alias="greeting5">Endelig fredag!</key>
     <key alias="greeting6">Glædelig lørdag</key>
-    
+
 
     <key alias="instruction">indtast brugernavn og kodeord</key>
     <key alias="timeout">Din session er udløbet</key>
@@ -538,17 +580,17 @@ Hej %0%
 Dette er en automatisk mail for at fortælle at handlingen '%1%'
 er blevet udført på siden '%2%'
 af brugeren '%3%'
-		
+
 Gå til http://%4%/#/content/content/edit/%5% for at redigere.
-	
+
 Ha' en dejlig dag!
-		
+
 Mange hilsner fra Umbraco robotten
 		]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p> 
+    <key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p>
     <p>Dette er en automatisk mail for at informere dig om at opgaven <strong>'%1%'</strong>
     er blevet udførtpå siden <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> af brugeren <strong>'%3%'</strong> </p>
-    <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> 
+    <div style="margin: 8px 0; padding: 8px; display: block;"> <br />
     <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]></key>
     <key alias="mailSubject">[%0%] Notificering om %1% udført på %2%</key>
     <key alias="notifications">Notificeringer</key>
@@ -668,7 +710,69 @@ Mange hilsner fra Umbraco robotten
 
     <key alias="allowAllEditors">Tillad alle editorer</key>
     <key alias="allowAllRowConfigurations">Tillad alle rækkekonfigurationer</key>
+
+    <key alias="setAsDefault">Sæt som standard</key>
+    <key alias="chooseExtra">Vælg ekstra</key>
+    <key alias="chooseDefault">Vælg standard</key>
+    <key alias="areAdded">er tilføjet</key>
   </area>
+
+  <area alias="contentTypeEditor">
+
+      <key alias="compositions">Kompositioner</key>
+      <key alias="noTabs">Du har ikke tilføjet nogle faner</key>
+      <key alias="addNewTab">Tilføj ny fane</key>
+      <key alias="addAnotherTab">Tilføj endnu en fane</key>
+      <key alias="inheritedFrom">Nedarvet fra</key>
+      <key alias="addProperty">Tilføj property</key>
+      <key alias="requiredLabel">Påkrævet label</key>
+
+      <key alias="enableListViewHeading">Aktiver listevisning</key>
+      <key alias="enableListViewDescription">Konfigurer indholdet til at blive vist i en sorterbar og søgbar liste, dens børn vil ikke blive vist i træet</key>
+
+      <key alias="allowedTemplatesHeading">Tilladte skabeloner</key>
+      <key alias="allowedTemplatesDescription">Vælg hvilke skabeloner der er tilladt at bruge på dette indhold</key>
+
+      <key alias="allowAsRootHeading">Tillad på rodniveau</key>
+      <key alias="allowAsRootDescription">Kun dokumenttyper med denne indstilling aktiveret oprettes i rodniveau under inhold og mediearkiv</key>
+      <key alias="allowAsRootCheckbox">Ja – indhold af denne type er tilladt i roden</key>
+
+      <key alias="childNodesHeading">Tilladte typer</key>
+      <key alias="childNodesDescription">Tillad at oprette indhold af en specifik type under denne</key>
+
+      <key alias="chooseChildNode">Vælg child node</key>
+
+      <key alias="compositionsDescription">Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens.</key>
+      <key alias="compositionInUse">Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition</key>
+      <key alias="noAvailableCompositions">Der er ingen indholdstyper tilgængelige at bruge som komposition</key>
+
+      <key alias="availableEditors">Tilgængelige editors</key>
+      <key alias="reuse">Genbrug</key>
+      <key alias="editorSettings">Editor indstillinger</key>
+
+      <key alias="configuration">Konfiguration</key>
+
+      <key alias="yesDelete">Ja, slet</key>
+
+      <key alias="movedUnderneath">blev flyttet til</key>
+      <key alias="folderToMove">Vælg hvor</key>
+      <key alias="structureBelow">skal flyttes til</key>
+
+      <key alias="allDocumentTypes">Alle dokumenttyper</key>
+      <key alias="allDocuments">Alle dokumenter</key>
+      <key alias="allMediaItems">Alle medier</key>
+
+      <key alias="usingThisDocument">som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+      <key alias="usingThisMedia">som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+      <key alias="usingThisMember">som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+
+      <key alias="andAllDocuments">og alle dokumenter, som benytter denne type</key>
+      <key alias="andAllMediaItems">og alle medier, som benytter denne type</key>
+      <key alias="andAllMembers">og alle medlemmer, som benytter denne type</key>
+
+      <key alias="thisEditorUpdateSettings">der bruger denne editor vil blive opdateret med de nye indstillinger</key>
+  </area>
+
   <area alias="rollback">
     <key alias="currentVersion">Nuværende version</key>
     <key alias="diffHelp"><![CDATA[Her vises forskellene mellem den nuværende version og den valgte version<br /><del>Rød</del> tekst vil ikke blive vist i den valgte version. <ins>Grøn betyder tilføjet</ins>]]></key>
@@ -940,4 +1044,12 @@ Mange hilsner fra Umbraco robotten
     <key alias="yourHistory">Din historik</key>
     <key alias="sessionExpires">Session udløber</key>
   </area>
+  <area alias="validation">
+      <key alias="validation">Validation</key>
+      <key alias="validateAsEmail">Valider som email</key>
+      <key alias="validateAsNumber">Valider som tal</key>
+      <key alias="validateAsUrl">Valider som Url</key>
+      <key alias="enterCustomValidation">...eller indtast din egen validering</key>
+      <key alias="fieldIsMandatory">Feltet er påkrævet</key>
+  </area>
 </language>

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

@@ -89,6 +89,7 @@
     <key alias="save">Save</key>
     <key alias="saveAndPublish">Save and publish</key>
     <key alias="saveToPublish">Save and send for approval</key>
+    <key alias="saveListView">Save list view</key>
     <key alias="showPage">Preview</key>
     <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
     <key alias="styleChoose">Choose style</key>
@@ -134,6 +135,7 @@
     <key alias="itemChanged">This item has been changed after publication</key>
     <key alias="itemNotPublished">This item is not published</key>
     <key alias="lastPublished">Last published</key>
+    <key alias="noItemsToShow">There are no items to show</key>
     <key alias="listViewNoItems" version="7.1.5">There are no items to show in the list.</key>
     <key alias="mediatype">Media Type</key>
     <key alias="mediaLinks">Link to media item(s)</key>
@@ -170,6 +172,9 @@
     <key alias="clickToUpload">Click to upload</key>
     <key alias="dropFilesHere">Drop your files here...</key>
 	<key alias="urls">Link to media</key>
+    <key alias="orClickHereToUpload">or click here to choose files</key>
+    <key alias="onlyAllowedFiles">Only allowed file types are</key>
+    <key alias="maxFileSize">Max file size is</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>
@@ -181,6 +186,7 @@
     <key alias="updateData">Choose a type and a title</key>
     <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available. You must enable these in the settings section under <strong>"document types"</strong>.]]></key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available. You must enable these in the settings section under <strong>"media types"</strong>.]]></key>
+    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Browse your website</key>
@@ -238,6 +244,40 @@
     <key alias="thumbnailimageclickfororiginal">Click on the image to see full size</key>
     <key alias="treepicker">Pick item</key>
     <key alias="viewCacheItem">View Cache Item</key>
+    <key alias="createFolder">Create folder...</key>
+
+    <key alias="relateToOriginalLabel">Relate to original</key>
+    <key alias="theFriendliestCommunity">The friendliest community</key>
+
+    <key alias="linkToPage">Link to page</key>
+
+    <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
+    <key alias="openInFullBody">Opens the linked document in the full body of the window</key>
+    <key alias="openInParentFrame">Opens the linked document in the parent frame</key>
+
+    <key alias="linkToMedia">Link to media</key>
+
+    <key alias="selectMedia">Select media</key>
+    <key alias="selectIcon">Select icon</key>
+    <key alias="selectItem">Select item</key>
+    <key alias="selectLink">Select link</key>
+    <key alias="selectMacro">Select macro</key>
+    <key alias="selectContent">Select content</key>
+    <key alias="selectMember">Select member</key>
+    <key alias="selectMemberGroup">Select member group</key>
+
+    <key alias="noMacroParams">There are no parameters for this macro</key>
+
+    <key alias="externalLoginProviders">External login providers</key>
+    <key alias="exceptionDetail">Exception Details</key>
+    <key alias="stracktrace">Stacktrace</key>
+
+    <key alias="linkYour">Link your</key>
+    <key alias="unLinkYour">Un-Link your</key>
+
+    <key alias="account">account</key>
+
+    <key alias="selectEditor">Select editor</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description"><![CDATA[
@@ -250,6 +290,8 @@
     <key alias="password">Enter your password</key>
     <key alias="nameentity">Name the %0%...</key>
     <key alias="entername">Enter a name...</key>
+    <key alias="label">Label...</key>
+    <key alias="enterDescription">Enter a description...</key>
     <key alias="search">Type to search...</key>
     <key alias="filter">Type to filter...</key>
     <key alias="enterTags">Type to add tags (press enter after each tag)...</key>
@@ -299,6 +341,7 @@
     <key alias="errorRegExpWithoutTab">%0% is not in a correct format</key>
   </area>
   <area alias="errors">
+    <key alias="receivedErrorFromServer">Received an error from the server</key>
     <key alias="dissallowedMediaType">The specified file type has been disallowed by the administrator</key>
     <key alias="codemirroriewarning">NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.</key>
     <key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
@@ -329,6 +372,7 @@
     <key alias="actions">Actions</key>
     <key alias="add">Add</key>
     <key alias="alias">Alias</key>
+    <key alias="all">All</key>
     <key alias="areyousure">Are you sure?</key>
     <key alias="border">Border</key>
     <key alias="by">by</key>
@@ -366,6 +410,7 @@
     <key alias="innerMargin">Inner margin</key>
     <key alias="insert">Insert</key>
     <key alias="install">Install</key>
+    <key alias="invalid">Invalid</key>
     <key alias="justify">Justify</key>
     <key alias="language">Language</key>
     <key alias="layout">Layout</key>
@@ -405,7 +450,7 @@
     <key alias="showPageOnSend">Show page on Send</key>
     <key alias="size">Size</key>
     <key alias="sort">Sort</key>
-    <key alias="submit">Submit</key> <!-- TODO: Add to other languasge files -->
+    <key alias="submit">Submit</key>
     <key alias="type">Type</key>
     <key alias="typeToSearch">Type to search...</key>
     <key alias="up">Up</key>
@@ -424,7 +469,44 @@
     <key alias="searchResults">Search results</key>
     <key alias="reorder">Reorder</key>
     <key alias="reorderDone">I am done reordering</key>
+    <key alias="preview">Preview</key>
+    <key alias="changePassword">Change password</key>
+    <key alias="to">to</key>
+    <key alias="listView">List view</key>
+    <key alias="saving">Saving...</key>
+    <key alias="current">current</key>
+    <key alias="move">Move</key>
+    <key alias="embed">Embed</key>
   </area>
+
+  <area alias="colors">
+    <key alias="black">Black</key>
+    <key alias="green">Green</key>
+    <key alias="yellow">Yellow</key>
+    <key alias="orange">Orange</key>
+    <key alias="blue">Blue</key>
+    <key alias="red">Red</key>
+  </area>
+
+  <area alias="shortcuts">
+      <key alias="addTab">Add tab</key>
+      <key alias="addProperty">Add property</key>
+      <key alias="addEditor">Add editor</key>
+      <key alias="addTemplate">Add template</key>
+      <key alias="addChildNode">Add child node</key>
+      <key alias="addChild">Add child</key>
+
+      <key alias="editDataType">Edit data type</key>
+
+      <key alias="navigateSections">Navigate sections</key>
+
+      <key alias="shortcut">Shortcuts</key>
+      <key alias="showShortcuts">show shortcuts</key>
+
+      <key alias="toggleListView">Toggle list view</key>
+      <key alias="toggleAllowAsRoot">Toggle allow as root</key>
+  </area>
+
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Background colour</key>
     <key alias="bold">Bold</key>
@@ -432,6 +514,7 @@
     <key alias="font">Font</key>
     <key alias="text">Text</key>
   </area>
+
   <area alias="headers">
     <key alias="page">Page</key>
   </area>
@@ -447,7 +530,7 @@
     <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
               <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
               <p>
-              Click the <strong>retry</strong> button when 
+              Click the <strong>retry</strong> button when
               done.<br /><a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
 			              More information on editing web.config here.</a></p>]]></key>
     <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
@@ -458,9 +541,9 @@
       Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
       <p>
       Don't worry - no content will be deleted and everything will continue working afterwards!
-      </p>    
+      </p>
       ]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to 
+    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to
       proceed. ]]></key>
     <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
     <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
@@ -469,7 +552,7 @@
     <key alias="defaultUserPasswordChanged">The password is changed!</key>
     <key alias="defaultUserText"><![CDATA[
         <p>
-          Umbraco creates a default user with a login <strong>('admin')</strong> and password <strong>('default')</strong>. It's <strong>important</strong> that the password is 
+          Umbraco creates a default user with a login <strong>('admin')</strong> and password <strong>('default')</strong>. It's <strong>important</strong> that the password is
           changed to something unique.
         </p>
         <p>
@@ -504,7 +587,7 @@
     ]]></key>
     <key alias="runwayFromScratch">I want to start from scratch</key>
     <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates. 
+        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
         (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
         You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
       ]]></key>
@@ -518,8 +601,8 @@
     <key alias="runwaySimpleSite">I want to start with a simple website</key>
     <key alias="runwaySimpleSiteText"><![CDATA[
       <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically, 
-        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However, 
+      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
         Runway offers an easy foundation based on best practices to get you started faster than ever.
         If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
         </p>
@@ -540,9 +623,9 @@ You installed Runway, so why not see how your new website looks.]]></key>
     <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
 Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]></key>
     <key alias="theEndHeader">Umbraco %0% is installed and ready for use</key>
-    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to 
+    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
         manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>, 
+    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
 you can find plenty of resources on our getting started pages.]]></key>
     <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
 To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
@@ -610,13 +693,13 @@ To manage your website, simply open the Umbraco back office and start adding con
     ]]></key>
     <key alias="mailBodyHtml"><![CDATA[<p>Hi %0%</p>
 
-		  <p>This is an automated mail to inform you that the task <strong>'%1%'</strong> 
+		  <p>This is an automated mail to inform you that the task <strong>'%1%'</strong>
 		  has been performed on the page <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a>
 		  by the user <strong>'%3%'</strong>
 	  </p>
 		  <div style="margin: 8px 0; padding: 8px; display: block;">
 				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; 
+				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
 				<br />
 		  </div>
 		  <p>
@@ -628,7 +711,7 @@ To manage your website, simply open the Umbraco back office and start adding con
 
 		  <div style="margin: 8px 0; padding: 8px; display: block;">
 				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; 
+				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
 				<br />
 		  </div>
 
@@ -791,6 +874,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
     <key alias="masterDocumentType">Master Document Type</key>
     <key alias="createMatchingTemplate">Create matching template</key>
+    <key alias="addIcon">Add icon</key>
   </area>
   <area alias="sort">
     <key alias="sortDone">Sorting complete.</key>
@@ -798,8 +882,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="sortPleaseWait"><![CDATA[ Please wait. Items are being sorted, this can take a while.<br/> <br/> Do not close this window during sorting]]></key>
   </area>
   <area alias="speechBubbles">
-	<key alias="validationFailedHeader">Validation</key>  
-	<key alias="validationFailedMessage">Validation errors must be fixed before the item can be saved</key>  
+	<key alias="validationFailedHeader">Validation</key>
+	<key alias="validationFailedMessage">Validation errors must be fixed before the item can be saved</key>
     <key alias="operationFailedHeader">Failed</key>
     <key alias="invalidUserPermissionsText">Insufficient user permissions, could not complete the operation</key>
     <key alias="operationCancelledHeader">Cancelled</key>
@@ -920,9 +1004,28 @@ To manage your website, simply open the Umbraco back office and start adding con
 
     <key alias="allowAllEditors">Allow all editors</key>
     <key alias="allowAllRowConfigurations">Allow all row configurations</key>
+    <key alias="setAsDefault">Set as default</key>
+    <key alias="chooseExtra">Choose extra</key>
+    <key alias="chooseDefault">Choose default</key>
+    <key alias="areAdded">are added</key>
   </area>
 
   <area alias="contentTypeEditor">
+
+      <key alias="compositions">Compositions</key>
+      <key alias="noTabs">You have not added any tabs</key>
+      <key alias="addNewTab">Add new tab</key>
+      <key alias="addAnotherTab">Add another tab</key>
+      <key alias="inheritedFrom">Inherited from</key>
+      <key alias="addProperty">Add property</key>
+      <key alias="requiredLabel">Required label</key>
+
+      <key alias="enableListViewHeading">Enable list view</key>
+      <key alias="enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</key>
+
+      <key alias="allowedTemplatesHeading">Allowed Templates</key>
+      <key alias="allowedTemplatesDescription">Choose which templates editors are allowed to use on content of this type</key>
+
       <key alias="allowAsRootHeading">Allow as root</key>
       <key alias="allowAsRootDescription">Allow editors to create content of this type in the root of the content tree</key>
       <key alias="allowAsRootCheckbox">Yes - allow content of this type in the root</key>
@@ -931,6 +1034,36 @@ To manage your website, simply open the Umbraco back office and start adding con
       <key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type</key>
 
       <key alias="chooseChildNode">Choose child node</key>
+
+      <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
+      <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
+      <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
+
+      <key alias="availableEditors">Available editors</key>
+      <key alias="reuse">Reuse</key>
+      <key alias="editorSettings">Editor settings</key>
+
+      <key alias="configuration">Configuration</key>
+
+      <key alias="yesDelete">Yes, delete</key>
+
+      <key alias="movedUnderneath">was moved underneath</key>
+      <key alias="folderToMove">Select the folder to move</key>
+      <key alias="structureBelow">to in the tree structure below</key>
+
+      <key alias="allDocumentTypes">All Document types</key>
+      <key alias="allDocuments">All Documents</key>
+      <key alias="allMediaItems">All media items</key>
+
+      <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
+      <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
+      <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
+
+      <key alias="andAllDocuments">and all documents using this type</key>
+      <key alias="andAllMediaItems">and all media items using this type</key>
+      <key alias="andAllMembers">and all members using this type</key>
+
+      <key alias="thisEditorUpdateSettings">using this editor will get updated with the new settings</key>
   </area>
 
   <area alias="templateEditor">
@@ -965,7 +1098,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   </area>
   <area alias="translation">
     <key alias="assignedTasks">Tasks assigned to you</key>
-    <key alias="assignedTasksHelp"><![CDATA[ The list below shows translation tasks <strong>assigned to you</strong>. To see a detailed view including comments, click on "Details" or just the page name. 
+    <key alias="assignedTasksHelp"><![CDATA[ The list below shows translation tasks <strong>assigned to you</strong>. To see a detailed view including comments, click on "Details" or just the page name.
      You can also download the page as XML directly by clicking the "Download Xml" link. <br/>
      To close a translation task, please go to the Details view and click the "Close" button.
     ]]></key>
@@ -994,8 +1127,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="mailSubject">[%0%] Translation task for %1%</key>
     <key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
     <key alias="ownedTasks">Tasks created by you</key>
-    <key alias="ownedTasksHelp"><![CDATA[ The list below shows pages <strong>created by you</strong>. To see a detailed view including comments, 
-     click on "Details" or just the page name. You can also download the page as XML directly by clicking the "Download Xml" link. 
+    <key alias="ownedTasksHelp"><![CDATA[ The list below shows pages <strong>created by you</strong>. To see a detailed view including comments,
+     click on "Details" or just the page name. You can also download the page as XML directly by clicking the "Download Xml" link.
      To close a translation task, please go to the Details view and click the "Close" button.
     ]]></key>
     <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
@@ -1092,5 +1225,13 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="yourProfile" version="7.0">Your profile</key>
     <key alias="yourHistory" version="7.0">Your recent history</key>
     <key alias="sessionExpires" version="7.0">Session expires in</key>
+  </area>  
+  <area alias="validation">
+      <key alias="validation">Validation</key>
+      <key alias="validateAsEmail">Validate as email</key>
+      <key alias="validateAsNumber">Validate as a number</key>
+      <key alias="validateAsUrl">Validate as a Url</key>
+      <key alias="enterCustomValidation">...or enter a custom validation</key>
+      <key alias="fieldIsMandatory">Field is mandatory</key>
   </area>
 </language>

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

@@ -89,6 +89,7 @@
     <key alias="save">Save</key>
     <key alias="saveAndPublish">Save and publish</key>
     <key alias="saveToPublish">Save and send for approval</key>
+    <key alias="saveListView">Save list view</key>
     <key alias="showPage">Preview</key>
     <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
     <key alias="styleChoose">Choose style</key>
@@ -133,6 +134,7 @@
     <key alias="itemChanged">This item has been changed after publication</key>
     <key alias="itemNotPublished">This item is not published</key>
     <key alias="lastPublished">Last published</key>
+    <key alias="noItemsToShow">There are no items to show</key>
     <key alias="listViewNoItems" version="7.1.5">There are no items to show in the list.</key>
     <key alias="mediatype">Media Type</key>
     <key alias="mediaLinks">Link to media item(s)</key>
@@ -168,7 +170,10 @@
   <area alias="media">
     <key alias="clickToUpload">Click to upload</key>
     <key alias="dropFilesHere">Drop your files here...</key>
-	<key alias="urls">Link to media</key>
+	  <key alias="urls">Link to media</key>
+    <key alias="orClickHereToUpload">or click here to choose files</key>
+    <key alias="onlyAllowedFiles">Only allowed file types are</key>
+    <key alias="maxFileSize">Max file size is</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>
@@ -180,6 +185,7 @@
     <key alias="updateData">Choose a type and a title</key>
     <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available. You must enable these in the settings section under <strong>"document types"</strong>.]]></key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available. You must enable these in the settings section under <strong>"media types"</strong>.]]></key>
+    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Browse your website</key>
@@ -237,6 +243,40 @@
     <key alias="thumbnailimageclickfororiginal">Click on the image to see full size</key>
     <key alias="treepicker">Pick item</key>
     <key alias="viewCacheItem">View Cache Item</key>
+    <key alias="createFolder">Create folder...</key>
+    
+    <key alias="relateToOriginalLabel">Relate to original</key>
+    <key alias="theFriendliestCommunity">The friendliest community</key>
+    
+    <key alias="linkToPage">Link to page</key>
+    
+    <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
+    <key alias="openInFullBody">Opens the linked document in the full body of the window</key>
+    <key alias="openInParentFrame">Opens the linked document in the parent frame</key>
+    
+    <key alias="linkToMedia">Link to media</key>
+    
+    <key alias="selectMedia">Select media</key>
+    <key alias="selectIcon">Select icon</key>
+    <key alias="selectItem">Select item</key>
+    <key alias="selectLink">Select link</key>
+    <key alias="selectMacro">Select macro</key>
+    <key alias="selectContent">Select content</key>
+    <key alias="selectMember">Select member</key>
+    <key alias="selectMemberGroup">Select member group</key>
+    
+    <key alias="noMacroParams">There are no parameters for this macro</key>
+    
+    <key alias="externalLoginProviders">External login providers</key>
+    <key alias="exceptionDetail">Exception Details</key>
+    <key alias="stracktrace">Stacktrace</key>
+    
+    <key alias="linkYour">Link your</key>
+    <key alias="unLinkYour">Un-Link your</key>
+    
+    <key alias="account">account</key>
+    
+    <key alias="selectEditor">Select editor</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description"><![CDATA[
@@ -249,6 +289,8 @@
     <key alias="password">Enter your password</key>
     <key alias="nameentity">Name the %0%...</key>
     <key alias="entername">Enter a name...</key>
+    <key alias="label">Label...</key>
+    <key alias="enterDescription">Enter a description...</key>
     <key alias="search">Type to search...</key>
     <key alias="filter">Type to filter...</key>
     <key alias="enterTags">Type to add tags (press enter after each tag)...</key>
@@ -299,6 +341,7 @@
     <key alias="errorRegExpWithoutTab">%0% is not in a correct format</key>
   </area>
   <area alias="errors">
+    <key alias="receivedErrorFromServer">Received an error from the server</key>
     <key alias="dissallowedMediaType">The specified file type has been disallowed by the administrator</key>
     <key alias="codemirroriewarning">NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.</key>
     <key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
@@ -329,6 +372,7 @@
     <key alias="actions">Actions</key>
     <key alias="add">Add</key>
     <key alias="alias">Alias</key>
+    <key alias="all">All</key>
     <key alias="areyousure">Are you sure?</key>
     <key alias="border">Border</key>
     <key alias="by">by</key>
@@ -366,6 +410,7 @@
     <key alias="innerMargin">Inner margin</key>
     <key alias="insert">Insert</key>
     <key alias="install">Install</key>
+    <key alias="invalid">Invalid</key>
     <key alias="justify">Justify</key>
     <key alias="language">Language</key>
     <key alias="layout">Layout</key>
@@ -405,7 +450,7 @@
     <key alias="showPageOnSend">Show page on Send</key>
     <key alias="size">Size</key>
     <key alias="sort">Sort</key>
-    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
+    <key alias="submit">Submit</key>
     <key alias="type">Type</key>
     <key alias="typeToSearch">Type to search...</key>
     <key alias="up">Up</key>
@@ -424,6 +469,40 @@
     <key alias="searchResults">Search results</key>
     <key alias="reorder">Reorder</key>
     <key alias="reorderDone">I am done reordering</key>
+    <key alias="preview">Preview</key>
+    <key alias="changePassword">Change password</key>
+    <key alias="to">to</key>
+    <key alias="listView">List view</key>
+    <key alias="saving">Saving...</key>
+    <key alias="current">current</key>
+    <key alias="move">Move</key>
+    <key alias="embed">Embed</key>
+  </area>
+  <area alias="colors">
+    <key alias="black">Black</key>
+    <key alias="green">Green</key>
+    <key alias="yellow">Yellow</key>
+    <key alias="orange">Orange</key>
+    <key alias="blue">Blue</key>
+    <key alias="red">Red</key>
+  </area>
+  <area alias="shortcuts">
+    <key alias="addTab">Add tab</key>
+    <key alias="addProperty">Add property</key>
+    <key alias="addEditor">Add editor</key>
+    <key alias="addTemplate">Add template</key>
+    <key alias="addChildNode">Add child node</key>
+    <key alias="addChild">Add child</key>
+    
+    <key alias="editDataType">Edit data type</key>
+    
+    <key alias="navigateSections">Navigate sections</key>
+    
+    <key alias="shortcut">Shortcuts</key>
+    <key alias="showShortcuts">show shortcuts</key>
+    
+    <key alias="toggleListView">Toggle list view</key>
+    <key alias="toggleAllowAsRoot">Toggle allow as root</key>
   </area>
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Background color</key>
@@ -447,7 +526,7 @@
     <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
               <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
               <p>
-              Click the <strong>retry</strong> button when 
+              Click the <strong>retry</strong> button when
               done.<br /><a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
 			              More information on editing web.config here.</a></p>]]></key>
     <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
@@ -460,21 +539,17 @@
       Don't worry - no content will be deleted and everything will continue working afterwards!
       </p>    
       ]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to 
-      proceed. ]]></key>
+    <key alias="databaseUpgradeDone">
+      <![CDATA[Your database has been upgraded to the final version %0%.<br/>Press <strong>Next</strong> to
+      proceed. ]]>
+    </key>
     <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
     <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
     <key alias="defaultUserDisabled"><![CDATA[<strong>The Default user has been disabled or has no access to Umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.]]></key>
     <key alias="defaultUserPassChanged"><![CDATA[<strong>The Default user's password has been successfully changed since the installation!</strong></p><p>No further actions needs to be taken. Click <strong>Next</strong> to proceed.]]></key>
     <key alias="defaultUserPasswordChanged">The password is changed!</key>
-    <key alias="defaultUserText"><![CDATA[
-        <p>
-          Umbraco creates a default user with a login <strong>('admin')</strong> and password <strong>('default')</strong>. It's <strong>important</strong> that the password is 
-          changed to something unique.
-        </p>
-        <p>
-          This step will check the default user's password and suggest if it needs to be changed.
-        </p>
+    <key alias="defaultUserText">
+          <![CDATA[Umbraco creates a default user with a login <strong>('admin')</strong> and password <strong> ('default')</strong>. It's <strong>important</strong> that the password is changed to something unique.     
       ]]></key>
     <key alias="greatStart">Get a great start, watch our introduction videos</key>
     <key alias="licenseText">By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.</key>
@@ -503,8 +578,9 @@
       It also stores temporary data (aka: cache) for enhancing the performance of your website.
     ]]></key>
     <key alias="runwayFromScratch">I want to start from scratch</key>
-    <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates. 
+    <key alias="runwayFromScratchText">
+      <![CDATA[
+        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
         (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
         You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
       ]]></key>
@@ -516,10 +592,11 @@
       ]]></key>
     <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
     <key alias="runwaySimpleSite">I want to start with a simple website</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[
+    <key alias="runwaySimpleSiteText">
+      <![CDATA[
       <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically, 
-        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However, 
+      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
         Runway offers an easy foundation based on best practices to get you started faster than ever.
         If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
         </p>
@@ -608,7 +685,8 @@ To manage your website, simply open the Umbraco back office and start adding con
 
       Cheers from the Umbraco robot
     ]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hi %0%</p>
+    <key alias="mailBodyHtml">
+          <![CDATA[<p>Hi %0%</p>
 
 		  <p>This is an automated mail to inform you that the task <strong>'%1%'</strong> 
 		  has been performed on the page <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a>
@@ -616,7 +694,7 @@ To manage your website, simply open the Umbraco back office and start adding con
 	  </p>
 		  <div style="margin: 8px 0; padding: 8px; display: block;">
 				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; 
+				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
 				<br />
 		  </div>
 		  <p>
@@ -791,6 +869,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
     <key alias="masterDocumentType">Master Document Type</key>
     <key alias="createMatchingTemplate">Create matching template</key>
+    <key alias="addIcon">Add icon</key>
   </area>
   <area alias="sort">
     <key alias="sortDone">Sorting complete.</key>
@@ -921,9 +1000,26 @@ To manage your website, simply open the Umbraco back office and start adding con
 
     <key alias="allowAllEditors">Allow all editors</key>
     <key alias="allowAllRowConfigurations">Allow all row configurations</key>
+    <key alias="setAsDefault">Set as default</key>
+    <key alias="chooseExtra">Choose extra</key>
+    <key alias="chooseDefault">Choose default</key>
+    <key alias="areAdded">are added</key>
   </area>
 
   <area alias="contentTypeEditor">
+    <key alias="compositions">Compositions</key>
+    <key alias="noTabs">You have not added any tabs</key>
+    <key alias="addNewTab">Add new tab</key>
+    <key alias="addAnotherTab">Add another tab</key>
+    <key alias="inheritedFrom">Inherited from</key>
+    <key alias="addProperty">Add property</key>
+    <key alias="requiredLabel">Required label</key>
+    
+    <key alias="enableListViewHeading">Enable list view</key>
+    <key alias="enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</key>
+    
+    <key alias="allowedTemplatesHeading">Allowed Templates</key>
+    <key alias="allowedTemplatesDescription">Choose which templates editors are allowed to use on content of this type</key>
     <key alias="allowAsRootHeading">Allow as root</key>
     <key alias="allowAsRootDescription">Allow editors to create content of this type in the root of the content tree</key>
     <key alias="allowAsRootCheckbox">Yes - allow content of this type in the root</key>
@@ -932,6 +1028,35 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type</key>
 
     <key alias="chooseChildNode">Choose child node</key>
+    <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
+    <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
+    <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
+    
+    <key alias="availableEditors">Available editors</key>
+    <key alias="reuse">Reuse</key>
+    <key alias="editorSettings">Editor settings</key>
+    
+    <key alias="configuration">Configuration</key>
+    
+    <key alias="yesDelete">Yes, delete</key>
+    
+    <key alias="movedUnderneath">was moved underneath</key>
+    <key alias="folderToMove">Select the folder to move</key>
+    <key alias="structureBelow">to in the tree structure below</key>
+    
+    <key alias="allDocumentTypes">All Document types</key>
+    <key alias="allDocuments">All Documents</key>
+    <key alias="allMediaItems">All media items</key>
+    
+    <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
+    
+    <key alias="andAllDocuments">and all documents using this type</key>
+    <key alias="andAllMediaItems">and all media items using this type</key>
+    <key alias="andAllMembers">and all members using this type</key>
+    
+    <key alias="thisEditorUpdateSettings">using this editor will get updated with the new settings</key>
   </area>
   
   <area alias="templateEditor">
@@ -1094,4 +1219,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="yourHistory" version="7.0">Your recent history</key>
     <key alias="sessionExpires" version="7.0">Session expires in</key>
   </area>
+  <area alias="validation">
+    <key alias="validation">Validation</key>
+    <key alias="validateAsEmail">Validate as email</key>
+    <key alias="validateAsNumber">Validate as a number</key>
+    <key alias="validateAsUrl">Validate as a Url</key>
+    <key alias="enterCustomValidation">...or enter a custom validation</key>
+    <key alias="fieldIsMandatory">Field is mandatory</key>
+  </area>
 </language>