From 7bc52b39485cfae50134d088f5d988bcda489b84 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Wed, 12 Jul 2017 15:06:29 +0200
Subject: [PATCH] localization fixes.

---
 .../src/views/common/dialogs/rteembed.html                     | 2 +-
 .../src/views/common/overlays/embed/embed.html                 | 2 +-
 .../src/views/common/overlays/mediaPicker/mediapicker.html     | 1 -
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj                       | 1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml                  | 1 -
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml               | 1 -
 src/Umbraco.Web.UI/umbraco/config/lang/ru.xml                  | 3 +--
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
index ba1adcbb88..7bf24c086f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
@@ -2,7 +2,7 @@
     <div class="umb-panel">
          <div class="umb-panel-body no-header with-footer">
             <umb-pane>
-                <umb-control-group label="@content_url">
+                <umb-control-group label="@general_url">
                     <input id="url" class="umb-editor input-block-level" type="text" ng-model="form.url" ng-keyup="$event.keyCode == 13 ? showPreview() : null" required />
                     <input type="button" ng-click="showPreview()" class="btn" localize="value" value="@general_retrieve" />
                 </umb-control-group>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
index 97b1382773..8c2e5d6bc6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
@@ -1,6 +1,6 @@
 <form ng-controller="Umbraco.Overlays.EmbedOverlay as vm">
 
-   <umb-control-group label="@content_url">
+   <umb-control-group label="@general_url">
        <input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
        <input type="button" ng-click="vm.showPreview()" class="btn" localize="value" value="@general_retrieve" />
    </umb-control-group>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
index 79aaa35344..ab745f0f75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
@@ -29,7 +29,6 @@
              <umb-button
                 type="button"
                 label-key="general_upload"
-                label="Upload"
                 action="upload()"
                 disabled="disabled">
              </umb-button>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 0f66880375..65593d2a9b 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -568,6 +568,7 @@
     <Content Include="Config\Lang\zh-CN.user.xml" />
     <Content Include="Umbraco\Config\Lang\cs.xml" />
     <Content Include="Umbraco\ClientRedirect.aspx" />
+    <Content Include="Umbraco\Config\Lang\tr.xml" />
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
     <Content Include="Umbraco\create.aspx" />
     <Content Include="Umbraco\Developer\Packages\installer.aspx" />
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 2b9e2732be..05571a55d9 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -170,7 +170,6 @@
     <key alias="updateDate">Last edited</key>
     <key alias="updateDateDesc" version="7.0">Date/time this document was edited</key>
     <key alias="uploadClear">Remove file(s)</key>
-    <key alias="url">URL</key>
     <key alias="urls">Link to document</key>
     <key alias="memberof">Member of group(s)</key>
     <key alias="notmemberof">Not a member of group(s)</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 3adb4cf48b..2eece34dd3 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -169,7 +169,6 @@
     <key alias="updateDate">Last edited</key>
     <key alias="updateDateDesc" version="7.0">Date/time this document was edited</key>
     <key alias="uploadClear">Remove file(s)</key>
-    <key alias="url">URL</key>
     <key alias="urls">Link to document</key>
     <key alias="memberof">Member of group(s)</key>
     <key alias="notmemberof">Not a member of group(s)</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index 96ae8900af..3cc1978416 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -215,7 +215,6 @@
     <key alias="updateDateDesc" version="7.0">Дата/время редактирования документа</key>
     <key alias="updatedBy" version="7.0">Обновлено</key>
     <key alias="uploadClear">Удалить файл</key>
-    <key alias="url">Интернет-ссылка</key>
     <key alias="urls">Ссылка на документ</key>
     <key alias="addTextBox">Добавить новое поле текста</key>
     <key alias="removeTextBox">Удалить это поле текста</key>
@@ -575,7 +574,7 @@
     <key alias="update">Обновить</key>
     <key alias="upgrade">Обновление</key>
     <key alias="upload">Загрузить</key>
-    <key alias="url">URL</key>
+    <key alias="url">Интернет-ссылка</key>
     <key alias="user">Пользователь</key>
     <key alias="username">Имя пользователя</key>
     <key alias="value">Значение</key>