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] 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>