From d0bafc6184c998793d3180bf71ab84cbdf927afb Mon Sep 17 00:00:00 2001
From: Chris Houston <chouston@vizioz.com>
Date: Sun, 30 Nov 2014 23:54:46 +0000
Subject: [PATCH] Removed "description" as Shaz pointed out this was not
 required. Fixed a couple of UK English spelling mistakes.

---
 .../src/common/directives/html/umbcontrolgroup.directive.js | 2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js
index 01a35e6cd9..f371dba9b5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js
@@ -8,7 +8,7 @@ angular.module("umbraco.directives.html")
         return {
             scope: {
                 label: "@label",
-                description: "@description",
+                description: "@",
                 hideLabel: "@",
                 alias: "@"
             },
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 7fabc9e4d7..3051f644a8 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -410,9 +410,9 @@
     <key alias="searchResults">Search results</key>
   </area>
   <area alias="graphicheadline">
-    <key alias="backgroundcolor">Background color</key>
+    <key alias="backgroundcolor">Background colour</key>
     <key alias="bold">Bold</key>
-    <key alias="color">Text color</key>
+    <key alias="color">Text colour</key>
     <key alias="font">Font</key>
     <key alias="text">Text</key>
   </area>
@@ -702,7 +702,7 @@ To manage your website, simply open the Umbraco back office and start adding con
       ]]></key>
   </area>
   <area alias="colorpicker">
-    <key alias="noColors">You have not configured any approved colors</key>
+    <key alias="noColors">You have not configured any approved colours</key>
   </area>
   <area alias="relatedlinks">
     <key alias="addExternal">Add external link</key>