From ca69e64846ec063526d5dd93e858529a85475e73 Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Sun, 26 Oct 2014 00:48:43 +0200
Subject: [PATCH 1/6] U4-5101: Localize Related Link property editor

---
 .../relatedlinks/relatedlinks.html            | 34 +++++++++----------
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 17 ++++------
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 16 ++++-----
 3 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
index 43ee95b5cd..8095d4adfc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
@@ -3,9 +3,9 @@
         <thead>
             <tr>
                 <td></td>
-                <td>Caption</td>
-                <td>Link</td>
-                <td>New window</td>
+                <td><localize key="relatedlinks_caption">Caption</localize></td>
+                <td><localize key="relatedlinks_link">Link</localize></td>
+                <td><localize key="relatedlinks_newWindow">New window</localize></td>
                 <td></td>
             </tr>
         </thead>
@@ -26,12 +26,12 @@
                     <div ng-show="link.edit">
                         <div ng-show="!link.isInternal">
                             <input type="text" ng-model="link.link" /><br />
-                            or <a href="#" ng-click="switchLinkType($event,link)">choose internal page</a>
+                            <localize key="or">or</localize> <a href="#" ng-click="switchLinkType($event,link)"><localize key="relatedlinks_chooseInternal">choose internal page</localize></a>
                         </div>
 
                         <div ng-show="link.isInternal">
-                            <span ng-bind="link.internalName"></span> <a href="#" ng-click="selectInternal($event,link)">Choose</a><br />
-                            or <a href="#" ng-click="switchLinkType($event,link)">enter external link</a>
+                            <span ng-bind="link.internalName"></span> <a href="#" ng-click="selectInternal($event,link)"><localize key="choose">Choose</localize></a><br />
+                            <localize key="or">or</localize> <a href="#" ng-click="switchLinkType($event,link)"><localize key="relatedlinks_enterExternal">enter external link</localize></a>
                         </div>
                     </div>
                 </td>
@@ -42,12 +42,12 @@
                 <td>
 
                     <div class="btn-group" ng-show="!link.edit">
-                        <button type="button" class="btn btn-default" ng-click="edit($index)">Edit</button>
-                        <button type="button" class="btn btn-default" ng-click="delete($index)">Delete</button>
+                        <button type="button" class="btn btn-default" ng-click="edit($index)"><localize key="edit">Edit</localize></button>
+                        <button type="button" class="btn btn-default" ng-click="delete($index)"><localize key="delete">Delete</localize></button>
                     </div>
                     <div class="btn-group" ng-show="link.edit">
-                        <button type="button" class="btn btn-default" ng-click="cancelEdit($index)">Cancel</button>
-                        <button type="button" class="btn btn-default" ng-click="cancelEdit($index)">Save</button>
+                        <button type="button" class="btn btn-default" ng-click="cancelEdit($index)"><localize key="cancel">Cancel</localize></button>
+                        <button type="button" class="btn btn-default" ng-click="cancelEdit($index)"><localize key="buttons_save">Save</localize></button>
                     </div>
 
                 </td>
@@ -56,23 +56,23 @@
         <tfoot>
             <tr>
                     <td></td>
-                    <td><input type="text" ng-model="newCaption" placeholder="Enter a new caption" val-highlight="hasError" /></td>
+                    <td><input type="text" ng-model="newCaption" localize="placeholder" placeholder="@relatedlinks_captionPlaceholder"  val-highlight="hasError" /></td>
                     <td>
                         <div ng-show="addExternal">
-                            <input type="text" ng-model="newLink" placeholder="Enter the link" />
-                            <br /> or
-                            <a href="#" ng-click="switch($event)">choose internal page</a>
+                            <input type="text" ng-model="newLink" localize="placeholder" placeholder="@relatedlinks_externalLinkPlaceholder" />
+                            <br /> <localize key="or">or</localize>
+                            <a href="#" ng-click="switch($event)"><localize key="relatedlinks_chooseInternal">choose internal page</localize></a>
                         </div>
 
                         <div ng-show="!addExternal">
-                            <span ng-bind="newInternalName"></span> <a href="#" ng-click="internal($event)">Choose</a><br />
-                            or <a href="#" ng-click="switch($event)">enter external link</a>
+                            <span ng-bind="newInternalName"></span> <a href="#" ng-click="internal($event)"><localize key="choose">Choose</localize></a><br />
+                            <localize key="or">or</localize> <a href="#" ng-click="switch($event)"><localize key="relatedlinks_enterExternal">enter external link</localize></a>
                         </div>
                     </td>
                     <td><input type="checkbox" ng-model="newNewWindow" /> </td>
                     <td>
                         <div class="btn-group">
-                            <button class="btn btn-default" ng-click="add($event)">Add</button>
+                            <button class="btn btn-default" ng-click="add($event)"><localize key="general_add">Add</localize></button>
                         </div>
                     </td>
             </tr>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 782651c19f..6d91941250 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -596,16 +596,13 @@ Mange hilsner fra Umbraco robotten
     <key alias="noColors">Du har ikke konfigureret nogen godkendte farver</key>
   </area>
   <area alias="relatedlinks">
-    <key alias="addExternal">Tilføj eksternt link</key>
-    <key alias="addInternal">Tilføj internt link</key>
-    <key alias="addlink">Tilføj</key>
-    <key alias="caption">Billedtekst</key>
-    <key alias="internalPage">Intern side</key>
-    <key alias="linkurl">URL</key>
-    <key alias="modeDown">Flyt ned</key>
-    <key alias="modeUp">Flyt op</key>
-    <key alias="newWindow">Åben i nyt vindue</key>
-    <key alias="removeLink">Fjern link</key>
+    <key alias="enterExternal">indtast eksternt link</key>
+    <key alias="chooseInternal">vælg en intern side</key>
+    <key alias="caption">Tekst</key>
+    <key alias="link">Link</key>
+    <key alias="newWindow">Nyt vindue</key>
+    <key alias="captionPlaceholder">Indtast en tekst</key>
+    <key alias="externalLinkPlaceholder">Indtast et link</key>
   </area>
   <area alias="rollback">
     <key alias="currentVersion">Nuværende version</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index a8f5a45a6f..cc4b9dbac4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -705,16 +705,14 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="noColors">You have not configured any approved colours</key>
   </area>
   <area alias="relatedlinks">
-    <key alias="addExternal">Add external link</key>
-    <key alias="addInternal">Add internal link</key>
-    <key alias="addlink">Add</key>
+    <key alias="enterExternal">enter external link</key>
+    <key alias="chooseInternal">choose internal page</key>
     <key alias="caption">Caption</key>
-    <key alias="internalPage">Internal page</key>
-    <key alias="linkurl">URL</key>
-    <key alias="modeDown">Move Down</key>
-    <key alias="modeUp">Move Up</key>
-    <key alias="newWindow">Open in new window</key>
-    <key alias="removeLink">Remove link</key>
+    <key alias="link">Link</key>
+    <key alias="newWindow">New window</key>
+    <key alias="captionPlaceholder">Enter a new caption</key>
+    <key alias="externalLinkPlaceholder">Enter the link</key>
+    
   </area>
   <area alias="rollback">
     <key alias="currentVersion">Current version</key>

From 0b6154663328fa9d910b88258d9bd770a5ca5510 Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Sun, 26 Oct 2014 00:56:18 +0200
Subject: [PATCH 2/6] U4-5101: Localize Tags property editor

---
 .../src/views/propertyeditors/tags/tags.html           | 10 +++++++---
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml          |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml          |  4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
index 9ed45bf1f6..8a757228e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
@@ -1,7 +1,11 @@
 <div ng-controller="Umbraco.PropertyEditors.TagsController" class="umb-editor umb-tags">
 
     <div ng-if="isLoading">
+<<<<<<< HEAD
         <localize key="loading" />...
+=======
+        <localize key="loading">Loading</localize>...
+>>>>>>> U4-5101: Localize Tags property editor
     </div>
 
     <div ng-if="!isLoading">
@@ -12,10 +16,10 @@
 
         <input type="text"
                class="typeahead tags-{{model.alias}}"
-               ng-model="$parent.tagToAdd"
+               ng-model="$parent.tagToAdd" 
                ng-keydown="$parent.addTagOnEnter($event)"
-               on-blur="$parent.addTag()"
+               on-blur="$parent.addTag()" 
                localize="placeholder"
-               placeholder="@placeholders_enterTags" />     
+               placeholder="@placeholders_enterTags" />
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 6d91941250..9b9bae9588 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -228,6 +228,7 @@
     <key alias="entername">Indtast navn...</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>
   </area>
   <area alias="editcontenttype">
 	<key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index cc4b9dbac4..e345db2c88 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -244,8 +244,8 @@
     <key alias="nameentity">Name the %0%...</key>
     <key alias="entername">Enter a name...</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>
+    <key alias="filter">Type to filter...</key>
+    <key alias="enterTags">Type to add tags (press enter after each tag)...</key>
   </area>
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Allow at root</key>

From 482e90dbc09e965a861ba6de78cceb1ea37a7b60 Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Sun, 26 Oct 2014 01:12:45 +0200
Subject: [PATCH 3/6] U4-5101: Localize Content Picker property editor

---
 .../views/propertyeditors/contentpicker/contentpicker.html  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index c94ef6b279..c5de0a69db 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -14,10 +14,10 @@
                     <i class="icon icon-delete red hover-show"></i>
                     <i class="{{node.icon}} hover-hide"></i> 
                     {{node.name}}
-                </a>
+                </a>
                 <div ng-if="!dialogEditor && model.config.showEditButton">
-                    <small><a href umb-launch-mini-editor="node">Edit</a></small>
-                </div>
+                    <small><a href umb-launch-mini-editor="node"><localize key="edit">Edit</localize></a></small>
+                </div>
             </li>
         </ul>
 

From 8bc9fb92425ed3dd1f454a219c186a94459cabfe Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Sun, 26 Oct 2014 11:10:18 +0100
Subject: [PATCH 4/6] U4-5101: Localize Image Cropper property editor

---
 .../src/views/propertyeditors/imagecropper/imagecropper.html  | 4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml                 | 3 +++
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml                 | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
index d5a8fe38a1..34b976e078 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
@@ -29,7 +29,7 @@
 
 					 <a href style="margin:auto; text-align: center; font-size: 11px;" class="btn btn-link red"
 					 		ng-click="currentCrop.coordinates = undefined; done()">
-					 		Reset
+                            <localize key="imagecropper_reset">Reset</localize>
 					 </a>
 				</div>
 			</div>
@@ -57,7 +57,7 @@
 					</li>
 				</ul>
 
-				<a href class="btn btn-link" ng-click="clear()"><i class="icon-delete red"></i> Remove file</a>
+				<a href class="btn btn-link" ng-click="clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></a>
 			</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 9b9bae9588..0e5c196061 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -605,6 +605,9 @@ Mange hilsner fra Umbraco robotten
     <key alias="captionPlaceholder">Indtast en tekst</key>
     <key alias="externalLinkPlaceholder">Indtast et link</key>
   </area>
+  <area alias="imagecropper">
+    <key alias="reset">Nulstil</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>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index e345db2c88..c483d09352 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -712,7 +712,9 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="newWindow">New window</key>
     <key alias="captionPlaceholder">Enter a new caption</key>
     <key alias="externalLinkPlaceholder">Enter the link</key>
-    
+  </area>
+  <area alias="imagecropper">
+    <key alias="reset">Reset</key>
   </area>
   <area alias="rollback">
     <key alias="currentVersion">Current version</key>

From 30042aae6d903d2f57686bc11535451c4e938686 Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Fri, 7 Nov 2014 22:35:33 +0100
Subject: [PATCH 5/6] U4-5101: Localize Grid property editor

---
 .../views/propertyeditors/grid/dialogs/additem.html    |  1 -
 .../src/views/propertyeditors/grid/editors/embed.html  |  2 +-
 .../src/views/propertyeditors/grid/editors/media.html  |  4 ++--
 .../views/propertyeditors/grid/editors/textstring.html |  2 +-
 .../src/views/propertyeditors/grid/grid.html           |  1 -
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml          | 10 ++++++++++
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml          | 10 ++++++++++
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html
index d945aa5a26..77e2c27bd5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html
@@ -1,7 +1,6 @@
 <div class="cell-tools-menu"
     ng-style="overlayMenu.style"
     delayed-mouseleave="closeItemOverlay()">
-
      <h5><localize key="grid_insertControl" /></h5>
 
      <ul class="elements">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index 7f4f970271..f2c49e8f39 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -2,7 +2,7 @@
 
 	<div class="usky-editor-placeholder" ng-click="setEmbed()" ng-if="control.value === null">
 		<i class="icon icon-movie-alt"></i>
-		<div class="help-text">Click to embed</div>
+		<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
 	</div>
 
 	<div ng-if="control.value" ng-bind-html-unsafe="control.value"></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
index 3c0a9dbe95..efb6c3e290 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
@@ -2,7 +2,7 @@
 
 	<div class="usky-editor-placeholder" ng-click="setImage()" ng-if="control.value === null">
 		<i class="icon icon-picture"></i>
-		<div ng-id="!control.$inserted" class="help-text">Click to insert image</div>
+        <div ng-id="!control.$inserted" class="help-text"><localize key="grid_clickToInsertImage">Click to insert image</localize></div>
 	</div>
 
 	<div ng-if="control.value">
@@ -11,6 +11,6 @@
 			ng-click="setImage()"
 			ng-src="{{url}}"
 			class="fullSizeImage" />
-		<input type="text" class="caption" ng-model="control.value.caption" placeholder="Image caption..."/>
+        <input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
  	</div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html
index b14156c35e..18526b0216 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html
@@ -5,5 +5,5 @@
 		umb-auto-focus
 		class="textstring input-block-level" id="{{control.uniqueId}}_text"
 		ng-model="control.value"
-		ng-attr-style="{{control.editor.config.style}}" placeholder="Write here..."></textarea>
+		ng-attr-style="{{control.editor.config.style}}" localize="placeholder" placeholder="@grid_placeholderWriteHere"></textarea>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 04357be332..b342db8025 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -234,7 +234,6 @@
 
                         </div> <!-- .templates-preview-rows -->
 
-
                         <p>
                             <span class="help-text"><localize key="grid_addRows" /></span>
                         </p>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 0e5c196061..c57192cc8c 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -608,6 +608,16 @@ Mange hilsner fra Umbraco robotten
   <area alias="imagecropper">
     <key alias="reset">Nulstil</key>
   </area>
+  <area alias="grid">
+    <key alias="helpSelectLayout">Vælg et layout for at starte</key>
+    <key alias="helpAddRows">Tilføj rækker til dit layout</key>
+    <key alias="helpAddElement"><![CDATA[Kom i gang ved at trykke på <i class=" icon icon-add blue"></i> nedenfor og tilføje det første element]]></key>
+    <key alias="insertControl">Indsæt element</key>
+    <key alias="clickToEmbed">Klik for at indlejre</key>
+    <key alias="clickToInsertImage">Klik for at indsætte et billede</key>
+    <key alias="placeholderImageCaption">Billedtekst...</key>
+    <key alias="placeholderWriteHere">Skriv her...</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>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index c483d09352..2e43a5909f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -716,6 +716,16 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="imagecropper">
     <key alias="reset">Reset</key>
   </area>
+  <area alias="grid">
+    <key alias="helpSelectLayout">To start, select a layout for your grid</key>
+    <key alias="helpAddRows">Add rows to your layout</key>
+    <key alias="helpAddElement"><![CDATA[To start, click the <i class=" icon icon-add blue"></i> below and add your first element]]></key>
+    <key alias="insertControl">Insert control</key>
+    <key alias="clickToEmbed">Click to embed</key>
+    <key alias="clickToInsertImage">Click to insert image</key>
+    <key alias="placeholderImageCaption">Image caption...</key>
+    <key alias="placeholderWriteHere">Write here...</key>
+  </area>
   <area alias="rollback">
     <key alias="currentVersion">Current version</key>
     <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>

From 77fd2c9444a868beb6c698f79aa8e068177fb6f8 Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Mon, 8 Dec 2014 18:36:51 +0100
Subject: [PATCH 6/6] Update translations for Grid

---
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 31 +++++++++++++++++--
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 16 +++-------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index c57192cc8c..cba2254cc8 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -609,14 +609,39 @@ Mange hilsner fra Umbraco robotten
     <key alias="reset">Nulstil</key>
   </area>
   <area alias="grid">
-    <key alias="helpSelectLayout">Vælg et layout for at starte</key>
-    <key alias="helpAddRows">Tilføj rækker til dit layout</key>
-    <key alias="helpAddElement"><![CDATA[Kom i gang ved at trykke på <i class=" icon icon-add blue"></i> nedenfor og tilføje det første element]]></key>
     <key alias="insertControl">Indsæt element</key>
+    <key alias="addRows">Tilføj rækker til dit layout</key>
+    <key alias="addElement"><![CDATA[Kom i gang ved at trykke på <i class=" icon icon-add blue"></i> nedenfor og tilføje det første element]]></key>
+
     <key alias="clickToEmbed">Klik for at indlejre</key>
     <key alias="clickToInsertImage">Klik for at indsætte et billede</key>
     <key alias="placeholderImageCaption">Billedtekst...</key>
     <key alias="placeholderWriteHere">Skriv her...</key>
+
+    <key alias="gridLayouts">Gridlayout</key>
+    <key alias="gridLayoutsDetail">Et layout er det overordnede arbejdsområde til dit gitter - du vil typisk kun behøve ét eller to</key>
+    <key alias="addGridLayout">Tilføj gitterlayout</key>
+    <key alias="addGridLayoutDetail">Juster dit layout ved at justere kolonnebredder og tilføj yderligere sektioner</key>
+
+    <key alias="rowConfigurations">Rækkekonfigurationer</key>
+    <key alias="rowConfigurationsDetail">Rækker er foruddefinerede celler, der arrangeres vandret</key>
+    <key alias="addRowConfiguration">Tilføj rækkekonfiguration</key>
+    <key alias="addRowConfigurationDetail">Juster rækken ved at indstille cellebredder og tilføje yderligere celler</key>
+
+    <key alias="columns">Kolonner</key>
+    <key alias="columnsDetails">Det totale antaller kolonner i gitteret</key>
+
+    <key alias="settings">Indstillinger</key>
+    <key alias="settingsDetails">Konfigurer, hvilket indstillinger, brugeren kan ændre</key>
+
+
+    <key alias="styles">Typografi</key>
+    <key alias="stylesDetails">Vælg, hvilke typografiværdier, en redaktør kan ændre</key>
+
+    <key alias="settingDialogDetails">Indstillinger gemmes kun, hvis den indtaste json-konfiguration er gyldig</key>
+
+    <key alias="allowAllEditors">Tillad alle editorer</key>
+    <key alias="allowAllRowConfigurations">Tillad alle rækkekonfigurationer</key>
   </area>
   <area alias="rollback">
     <key alias="currentVersion">Nuværende version</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 2e43a5909f..e43af2752f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -716,16 +716,6 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="imagecropper">
     <key alias="reset">Reset</key>
   </area>
-  <area alias="grid">
-    <key alias="helpSelectLayout">To start, select a layout for your grid</key>
-    <key alias="helpAddRows">Add rows to your layout</key>
-    <key alias="helpAddElement"><![CDATA[To start, click the <i class=" icon icon-add blue"></i> below and add your first element]]></key>
-    <key alias="insertControl">Insert control</key>
-    <key alias="clickToEmbed">Click to embed</key>
-    <key alias="clickToInsertImage">Click to insert image</key>
-    <key alias="placeholderImageCaption">Image caption...</key>
-    <key alias="placeholderWriteHere">Write here...</key>
-  </area>
   <area alias="rollback">
     <key alias="currentVersion">Current version</key>
     <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
@@ -855,12 +845,16 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="template">Template</key>
   </area>
 
-
   <area alias="grid">
     <key alias="insertControl">Insert control</key>
     <key alias="addRows">Add rows to your layout</key>
     <key alias="addElement"><![CDATA[To start, click the <i class="icon icon-add blue"></i> below and add your first element]]></key>
 
+    <key alias="clickToEmbed">Click to embed</key>
+    <key alias="clickToInsertImage">Click to insert image</key>
+    <key alias="placeholderImageCaption">Image caption...</key>
+    <key alias="placeholderWriteHere">Write here...</key>
+    
     <key alias="gridLayouts">Grid layouts</key>
     <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
     <key alias="addGridLayout">Add grid layout</key>