From 0eb8ebd82e7df4feba8be2673ce1d927168a9022 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Wed, 21 Jun 2017 14:04:15 +0200
Subject: [PATCH] fixing up translations.

---
 .../src/views/common/dialogs/linkpicker.html  |  2 +-
 .../src/views/common/dialogs/rteembed.html    |  2 +-
 .../common/dialogs/template/querybuilder.html |  2 +-
 .../overlays/insertfield/insertfield.html     |  8 ++--
 .../views/packager/views/install-local.html   |  4 +-
 .../src/views/packager/views/installed.html   |  4 +-
 .../src/views/packager/views/repo.html        | 14 +++---
 .../src/views/partialviewmacros/edit.html     |  2 +-
 .../src/views/partialviews/edit.html          |  2 +-
 .../contentpicker/contentpicker.html          |  5 +-
 .../datepicker/datepicker.html                |  2 +-
 .../propertyeditors/decimal/decimal.html      |  2 +-
 .../views/propertyeditors/email/email.html    |  2 +-
 .../imagecropper/imagecropper.prevalues.html  |  2 +-
 .../propertyeditors/integer/integer.html      |  2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 46 +++++++++++--------
 .../umbraco/config/lang/en_us.xml             | 42 +++++++++--------
 src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 28 +++++------
 18 files changed, 91 insertions(+), 80 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
index 6914a992da..badcc14487 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
@@ -63,7 +63,7 @@
 	        		<localize key="general_cancel">Cancel</localize>
 				</a>
 
-				<a href ng-click="switchToMediaPicker()" class="btn"><localize key="defaultdialogs_linkToMedia">Link to file</localize></a>
+				<a href ng-click="switchToMediaPicker()" class="btn"><localize key="defaultdialogs_linkToFile">Link to file</localize></a>
 
 				<button
 					class="btn btn-primary"
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 4c5cac62fd..9acb92401b 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
@@ -11,7 +11,7 @@
                     <umb-control-group label="Size">
                         <input type="text" ng-model="form.width" on-blur="changeSize('width')" style="width:50px"/> x <input type="text" ng-model="form.height" on-blur="changeSize('height')" style="width:50px"/>
 
-                        <label for="constrain" style="display:inline"><localize key="general_constrainProportions">Constrain</localize>:</label> 
+                        <label for="constrain" style="display:inline"><localize key="general_constrain">Constrain</localize>:</label> 
                         <input id="constrain" type="checkbox" ng-model="form.constrain" style="margin-bottom: 10px;"/>
                     </umb-control-group>
                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html
index 812bbf23ed..80ea07d003 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html
@@ -17,7 +17,7 @@
 	<div class="umb-panel">
 
 		<div class="umb-panel-header">
-		    <h1 class="headline" style="margin: 10px 0 0 0"><localize key="templte_buildQuery">Build a query</localize></h1>
+		    <h1 class="headline" style="margin: 10px 0 0 0"><localize key="template_buildQuery">Build a query</localize></h1>
 		</div>
 
 		<div class="umb-panel-body with-footer umb-querybuilder">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
index 9cff65f5e0..021b695716 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
@@ -29,7 +29,7 @@
 
             <div class="control-group umb-control-group -no-border" ng-hide="!vm.showAltField">
                 <div class="umb-el-wrap">
-                    <label class="control-label" for="altField"><localize key="templateEditor_alternativeField">Fallback field</loclize></label>
+                    <label class="control-label" for="altField"><localize key="templateEditor_fallbackField">Fallback field</localize></label>
                     <div class="controls">
                         <select ng-model="vm.altField" >
                             <optgroup localize="label" label="@templateEditor_customFields">
@@ -53,7 +53,7 @@
 
             <div class="control-group umb-control-group -no-border" ng-hide="!vm.showAltText">
                 <div class="umb-el-wrap">
-                    <label class="control-label" for="altText"><localize key="templateEditor_alternativeText">Default value</localize></label>
+                    <label class="control-label" for="altText"><localize key="templateEditor_defaultValue">Default value</localize></label>
                     <div class="controls">
                         <input type="text" name="altText" ng-model="vm.altText" umb-auto-focus>
                     </div>
@@ -163,7 +163,7 @@
                         </label>
                     </div>
                     <input type="checkbox" name="linebreaks" ng-model="vm.convertLinebreaks">
-                    <localize key="templateEditor_convertLineBreaks">Yes, convert line breaks</localize>
+                    <localize key="templateEditor_convertLineBreaksDescription">Yes, convert line breaks</localize>
                 </div>
             </div>
         </div>
@@ -179,7 +179,7 @@
                         </label>
                     </div>
                     <input type="checkbox" name="paragraph" ng-model="vm.removeParagraphTags">
-                    <localize key="templateEditor_removeParagraph">Yes, remove paragraph tags</localize>
+                    <localize key="templateEditor_removeParagraphDescription">Yes, remove paragraph tags</localize>
                 </div>
             </div>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
index df9680f0ca..b265a346b3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
@@ -44,7 +44,7 @@
 
                 <h3><strong><localize key="packager_uploadPackage">Upload package</localize></strong></h3>
                 <p class="faded">
-                    <localize key="packager_localPackageDescr">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</localize>.
+                    <localize key="packager_localPackageDescription">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</localize>.
                 </p>
 
             </form>
@@ -68,7 +68,7 @@
                     </div>
                     <div class="umb-package-info">
 
-                        <h4 class="umb-info-local-item"><strong><localize key="packager_installStateUploading">Uploading package</localize></strong></h4>
+                        <h4 class="umb-info-local-item"><strong><localize key="packager_installStateUploading">Uploading package...</localize></strong></h4>
 
                         <umb-progress-bar
                             percentage="{{vm.zipFile.uploadProgress}}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
index c306632e59..ca4f129398 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
@@ -37,7 +37,7 @@
             ng-if="vm.installedPackages.length === 0"
             position="center">
             <h4><strong><localize key="packager_noPackages">You don’t have any packages installed</localize>.</strong></h4>
-            <p class="faded"><localize key="packager_noPackagesDescr">You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the "Packages" icon in the top right of your screen</localize>.</p>
+            <p class="faded"><localize key="packager_noPackagesDescription">You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the "Packages" icon in the top right of your screen</localize>.</p>
         </umb-empty-state>
 
     </div>
@@ -47,7 +47,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.state = 'list'">&larr; <localize key="general_back">Take me back</localize></a>
+                <a class="umb-package-details__back-link" href="" ng-click="vm.state = 'list'">&larr; <localize key="general_back">Back</localize></a>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
index 007e8b96a4..7e352f27b0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
@@ -106,7 +106,7 @@
                 ng-if="vm.packages.length === 0 && vm.loading === false && vm.searchQuery !== ''"
                 position="center">
                 <h4><strong><localize key="packager_packageNoResults">We couldn't find anything for</localize> '{{ vm.searchQuery }}'</strong></h4>
-                <p class="faded"><localize key="packager_packageNoResultsDescr">Please try searching for another package or browse through the categories</localize>.</p>
+                <p class="faded"><localize key="packager_packageNoResultsDescription">Please try searching for another package or browse through the categories</localize>.</p>
             </umb-empty-state>
 
         </div>
@@ -119,7 +119,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageList');">&larr; <localize key="general_back">Take me back</localize></a>
+                <a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageList');">&larr; <localize key="general_back">Back</localize></a>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
@@ -203,12 +203,12 @@
                             </div>
 
                             <div class="umb-package-details__information-item" ng-if="vm.package.latestVersion">
-                                <div class="umb-package-details__information-item-label"><localize key="packager_packageCurrVersion">Current version</localize>:</div>
+                                <div class="umb-package-details__information-item-label"><localize key="packager_packageCurrentVersion">Current version</localize>:</div>
                                 <div class="umb-package-details__information-item-content">{{vm.package.latestVersion}}</div>
                             </div>
 
                             <div class="umb-package-details__information-item" ng-if="vm.package.information.netVersion">
-                                <div class="umb-package-details__information-item-label"><localize key="packager_packageNetVersion">.Net Version</localize>:</div>
+                                <div class="umb-package-details__information-item-label"><localize key="packager_packageNetVersion">.NET Version</localize>:</div>
                                 <div class="umb-package-details__information-item-content">{{vm.package.information.netVersion}}</div>
                             </div>
 
@@ -232,7 +232,7 @@
 
                     <div class="umb-package-details__section">
                         <div class="umb-package-details__section-title"><localize key="packager_packageCompatibility">Compatibility</localize></div>
-                        <div class="umb-package-details__section-description"><localize key="packager_packageCompatDescr">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%</localize></div>
+                        <div class="umb-package-details__section-description"><localize key="packager_packageCompatibilityDescription">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%</localize></div>
                         <div class="umb-package-details__compatability" ng-repeat="compatibility in vm.package.compatibility | filter:percentage > 0">
                             <div class="umb-package-details__compatability-label">
                                 <span class="umb-package-details__information-item-label">{{compatibility.version}}</span>
@@ -247,7 +247,7 @@
                     </div>
 
                     <div class="umb-package-details__section" ng-if="vm.package.externalSources">
-                        <div class="umb-package-details__section-title"><localize key="packager_packageExtSources">External sources</localize></div>
+                        <div class="umb-package-details__section-title"><localize key="packager_packageExternalSources">External sources</localize></div>
                         <div>
                             <div class="umb-package-details__information-item" ng-repeat="externalSource in vm.package.externalSources">
                                 <a class="umb-package-details__link" target="_blank" href="{{ externalSource.url }}">
@@ -269,7 +269,7 @@
     <div ng-if="vm.packageViewState === 'packageInstall' && vm.loading === false">
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageDetails');">&larr; <localize key="general_back">Take me back</localize></a>
+                <a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageDetails');">&larr; <localize key="general_back">Back</localize></a>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
index 4e0c899a6c..2c56655569 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
@@ -39,7 +39,7 @@
                             <ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
                                 <li><a href="" ng-click="vm.openPageFieldOverlay()"><localize key="template_insertPageField">Value</localize></a></li>
                                 <li><a href="" ng-click="vm.openMacroOverlay()"><localize key="template_insertMacro">Macro</localize></a></li>
-                                <li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary</localize></a></li>
+                                <li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary item</localize></a></li>
                             </ul>
 
                         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
index 8aebb555cf..3d9c9c4a9e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
@@ -39,7 +39,7 @@
                             <ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
                                 <li><a href="" ng-click="vm.openPageFieldOverlay()"><localize key="template_insertPageField">Value</localize></a></li>
                                 <li><a href="" ng-click="vm.openMacroOverlay()"><localize key="template_insertMacro">Macro</localize></a></li>
-                                <li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary</localize></a></li>
+                                <li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary item</localize></a></li>
                             </ul>
 
                         </div>
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 58df5532ad..75cc74f02d 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
@@ -30,13 +30,12 @@
         <input type="hidden" name="maxCount" ng-model="renderModel" />
 
         <div class="help-inline" val-msg-for="minCount" val-toggle-msg="minCount">
-            <localize key="validation_valMinCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_valItems">items</localize>
+            <localize key="validation_minCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_items">items</localize>
         </div>
 
         <div class="help-inline" val-msg-for="maxCount" val-toggle-msg="maxCount">
-            <localize key="validation_valMaxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_valItemsSel">items selected</localize>
+            <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected">items selected</localize>
         </div>
-        
 
     </ng-form>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index 9b299a5e28..ba21906a05 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -16,7 +16,7 @@
 
         <span class="help-inline" val-msg-for="datepicker" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
         <span class="help-inline" val-msg-for="datepicker" val-toggle-msg="valServer">{{datePickerForm.datepicker.errorMsg}}</span>
-        <span class="help-inline" val-msg-for="datepicker" val-toggle-msg="pickerError"><localize key="validation_valInvalidDate">Invalid date</localize></span>
+        <span class="help-inline" val-msg-for="datepicker" val-toggle-msg="pickerError"><localize key="validation_invalidDate">Invalid date</localize></span>
         
         <p ng-if="model.config.offsetTime === '1' && serverTimeNeedsOffsetting && model.value" class="muted">
             <small><localize key="content_scheduledPublishServerTime">This translates to the following time on the server:</localize> {{serverTime}}</small><br/>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
index 1a53c21a45..9b619bc6b5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
@@ -7,6 +7,6 @@
            val-server="value"
            fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
     
-    <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="number"><localize key="validation_valInvalidNumber">Not a number</localize></span>
+    <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="number"><localize key="validation_invalidNumber">Not a number</localize></span>
     <span class="help-inline" val-msg-for="decimalField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
index c4ddb26441..8455571c42 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
@@ -8,6 +8,6 @@
            val-server="value" />
     
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
-    <span class="help-inline" val-msg-for="textbox" val-toggle-msg="valEmail"><localize key="valiation_valInvalidEmail">Invalid email</localize></span>
+    <span class="help-inline" val-msg-for="textbox" val-toggle-msg="valEmail"><localize key="valiation_invalidEmail">Invalid email</localize></span>
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="valServer"></span>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
index 328a2269de..62a5565d95 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
@@ -18,7 +18,7 @@
     <div class="form" ng-show="newItem">
         <h4><localize key="imagecropper_defineCrop">Define crop</localize></h4>
         <p>
-            <localize key="imagecropper_defineCropDescr">Give the crop an alias and it's default width and height</localize>.
+            <localize key="imagecropper_defineCropDescription">Give the crop an alias and it's default width and height</localize>.
         </p>
 
         <div class="control-group">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
index 98c1818db4..5c38d085db 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
@@ -8,6 +8,6 @@
            val-server="value"
            fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
     
-    <span class="help-inline" val-msg-for="integerField" val-toggle-msg="number"><localize key="validation_valInvalidNumber">Not a number</localize></span>
+    <span class="help-inline" val-msg-for="integerField" val-toggle-msg="number"><localize key="validation_invalidNumber">Not a number</localize></span>
     <span class="help-inline" val-msg-for="integerField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
 </div>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 04b1ddce30..49a2fae91a 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -306,6 +306,7 @@
     <key alias="linkToPage">Link to page</key>
     <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
     <key alias="linkToMedia">Link to media</key>
+    <key alias="linkToFile">Link to file</key>
     <key alias="selectMedia">Select media</key>
     <key alias="selectIcon">Select icon</key>
     <key alias="selectItem">Select item</key>
@@ -322,7 +323,7 @@
     <key alias="stacktrace">Stacktrace</key>
     <key alias="innerException">Inner Exception</key>
     <key alias="linkYour">Link your</key>
-    <key alias="unLinkYour">Un-Link your</key>
+    <key alias="unLinkYour">Un-link your</key>
     <key alias="account">account</key>
     <key alias="selectEditor">Select editor</key>
     <key alias="selectSnippet">Select snippet</key>
@@ -448,6 +449,7 @@
     <key alias="closewindow">Close Window</key>
     <key alias="comment">Comment</key>
     <key alias="confirm">Confirm</key>
+    <key alias="constrain">Constrain</key>
     <key alias="constrainProportions">Constrain proportions</key>
     <key alias="continue">Continue</key>
     <key alias="copy">Copy</key>
@@ -821,11 +823,11 @@ To manage your website, simply open the Umbraco back office and start adding con
          button and locating the package. Umbraco packages usually have a ".zip" extension.
       ]]></key>
     <key alias="dropHere">Drop to upload</key>
-    <key alias="orClickHereToUpload">or click here to choose package file</key>
+    <key alias="orClickHereToUpload">or click here to choose files</key>
     <key alias="uploadPackage">Upload package</key>
-    <key alias="localPackageDescr">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</key>
+    <key alias="localPackageDescription">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</key>
     <key alias="uploadAnother">Upload another package</key>
-    <key alias="cancelAndAnother">Cancel and upload another package</key>
+    <key alias="cancelAndUploadAnother">Cancel and upload another package</key>
     <key alias="packageLicense">License</key>
     <key alias="accept">I accept</key>
     <key alias="termsOfUse">terms of use</key>
@@ -833,11 +835,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="installFinish">Finish</key>
     <key alias="installedPackages">Installed packages</key>
     <key alias="noPackages">You don’t have any packages installed</key>
-    <key alias="noPackagesDescr"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
+    <key alias="noPackagesDescription"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
     <key alias="packageSearch">Search for packages</key>
     <key alias="packageSearchResults">Results for</key>
     <key alias="packageNoResults">We couldn’t find anything for</key>
-    <key alias="packageNoResultsDescr">Please try searching for another package or browse through the categories</key>
+    <key alias="packageNoResultsDescription">Please try searching for another package or browse through the categories</key>
     <key alias="packagesPopular">Popular</key>
     <key alias="packagesNew">New releases</key>
     <key alias="packageHas">has</key>
@@ -846,13 +848,13 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="packageOwner">Owner</key>
     <key alias="packageContrib">Contributors</key>
     <key alias="packageCreated">Created</key>
-    <key alias="packageCurrVersion">Current version</key>
+    <key alias="packageCurrentVersion">Current version</key>
     <key alias="packageNetVersion">.NET version</key>
     <key alias="packageDownloads">Downloads</key>
     <key alias="packageLikes">Likes</key>
     <key alias="packageCompatibility">Compatibility</key>
-    <key alias="packageCompatDescr">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%</key>
-    <key alias="packageExtSources">External sources</key>
+    <key alias="packageCompatibilityDescription">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%</key>
+    <key alias="packageExternalSources">External sources</key>
     <key alias="packageAuthor">Author</key>
     <key alias="packageDemonstration">Demonstration</key>
     <key alias="packageDocumentation">Documentation</key>
@@ -887,7 +889,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="installStateInstalling">Installing...</key>
     <key alias="installStateRestarting">Restarting, please wait...</key>
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
-    <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload page.</key>
+    <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
     <key alias="installStateUploading">Uploading package...</key>
   </area>
   <area alias="paste">
@@ -957,7 +959,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="imagecropper">
     <key alias="reset">Reset</key>
     <key alias="defineCrop">Define crop</key>
-    <key alias="defineCropDescr">Give the crop an alias and it's default width and height</key>
+    <key alias="defineCropDescription">Give the crop an alias and its default width and height</key>
     <key alias="saveCrop">Save crop</key>
     <key alias="addCrop">Add new crop</key>
   </area>
@@ -1315,19 +1317,22 @@ To manage your website, simply open the Umbraco back office and start adding con
 
   <area alias="templateEditor">
     <key alias="addFallbackField">Add fallback field</key>
+    <key alias="fallbackField">Fallback field</key>
     <key alias="addDefaultValue">Add default value</key>
+    <key alias="defaultValue">Default value</key>
     <key alias="alternativeField">Alternative field</key>
     <key alias="alternativeText">Alternative Text</key>
     <key alias="casing">Casing</key>
     <key alias="encoding">Encoding</key>
     <key alias="chooseField">Choose field</key>
     <key alias="convertLineBreaks">Convert line breaks</key>
+    <key alias="convertLineBreaksDescription">Yes, convert line breaks</key>
     <key alias="convertLineBreaksHelp">Replaces line breaks with 'br' html tag</key>
     <key alias="customFields">Custom Fields</key>
     <key alias="dateOnly">Date only</key>
     <key alias="formatAndEncoding">Format and encoding</key>
     <key alias="formatAsDate">Format as date</key>
-    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, accoring to the active culture</key>
+    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, according to the active culture</key>
     <key alias="htmlEncode">HTML encode</key>
     <key alias="htmlEncodeHelp">Will replace special characters by their HTML equivalent.</key>
     <key alias="insertedAfter">Will be inserted after the field value</key>
@@ -1340,7 +1345,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="preContent">Insert before field</key>
     <key alias="recursive">Recursive</key>
     <key alias="recursiveDescr">Yes, make it recursive</key>
-    <key alias="removeParagraph">Remove Paragraph tags</key>
+    <key alias="removeParagraph">Remove paragraph tags</key>
+    <key alias="removeParagraphDescription">Yes, remove paragraph tags</key>
     <key alias="removeParagraphHelp">Will remove any paragraph tag in the beginning and end of the text</key>
     <key alias="separator">Separator</key>
     <key alias="standardFields">Standard Fields</key>
@@ -1493,13 +1499,13 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="enterCustomValidation">...or enter a custom validation</key>
     <key alias="fieldIsMandatory">Field is mandatory</key>
     <key alias="validationRegExp">Enter a regular expression</key>
-    <key alias="valMinCount">You need to add at least</key>
-    <key alias="valMaxCount">You can only have</key>
-    <key alias="valItems">items</key>
-    <key alias="valItemsSel">items selected</key>
-    <key alias="valInvalidDate">Invalid date</key>
-    <key alias="valInvalidNumber">Not a number</key>
-    <key alias="valInvalidEmail">Invalid email</key>
+    <key alias="minCount">You need to add at least</key>
+    <key alias="maxCount">You can only have</key>
+    <key alias="items">items</key>
+    <key alias="itemsSelected">items selected</key>
+    <key alias="invalidDate">Invalid date</key>
+    <key alias="invalidNumber">Not a number</key>
+    <key alias="invalidEmail">Invalid email</key>
   </area>
   <area alias="healthcheck">
 	  <!-- The following keys get these tokens passed in:
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 c8fc40aded..d5f46c0033 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -306,6 +306,7 @@
     <key alias="linkToPage">Link to page</key>
     <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
     <key alias="linkToMedia">Link to media</key>
+    <key alias="linkToFile">Link to file</key>
     <key alias="selectMedia">Select media</key>
     <key alias="selectIcon">Select icon</key>
     <key alias="selectItem">Select item</key>
@@ -321,7 +322,7 @@
     <key alias="stacktrace">Stacktrace</key>
     <key alias="innerException">Inner Exception</key>
     <key alias="linkYour">Link your</key>
-    <key alias="unLinkYour">Un-Link your</key>
+    <key alias="unLinkYour">Un-link your</key>
     <key alias="account">account</key>
     <key alias="selectEditor">Select editor</key>
     <key alias="selectSnippet">Select snippet</key>
@@ -447,6 +448,7 @@
     <key alias="closewindow">Close Window</key>
     <key alias="comment">Comment</key>
     <key alias="confirm">Confirm</key>
+    <key alias="constrain">Constrain</key>
     <key alias="constrainProportions">Constrain proportions</key>
     <key alias="continue">Continue</key>
     <key alias="copy">Copy</key>
@@ -820,7 +822,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="uploadPackage">Upload package</key>
     <key alias="localPackageDescr">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</key>
     <key alias="uploadAnother">Upload another package</key>
-    <key alias="cancelAndAnother">Cancel and upload another package</key>
+    <key alias="cancelAndUploadAnother">Cancel and upload another package</key>
     <key alias="packageLicense">License</key>
     <key alias="accept">I accept</key>
     <key alias="termsOfUse">terms of use</key>
@@ -828,11 +830,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="installFinish">Finish</key>
     <key alias="installedPackages">Installed packages</key>
     <key alias="noPackages">You don’t have any packages installed</key>
-    <key alias="noPackagesDescr"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
+    <key alias="noPackagesDescription"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
     <key alias="packageSearch">Search for packages</key>
     <key alias="packageSearchResults">Results for</key>
     <key alias="packageNoResults">We couldn’t find anything for</key>
-    <key alias="packageNoResultsDescr">Please try searching for another package or browse through the categories</key>
+    <key alias="packageNoResultsDescription">Please try searching for another package or browse through the categories</key>
     <key alias="packagesPopular">Popular</key>
     <key alias="packagesNew">New releases</key>
     <key alias="packageHas">has</key>
@@ -841,13 +843,13 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="packageOwner">Owner</key>
     <key alias="packageContrib">Contributors</key>
     <key alias="packageCreated">Created</key>
-    <key alias="packageCurrVersion">Current version</key>
+    <key alias="packageCurrentVersion">Current version</key>
     <key alias="packageNetVersion">.NET version</key>
     <key alias="packageDownloads">Downloads</key>
     <key alias="packageLikes">Likes</key>
     <key alias="packageCompatibility">Compatibility</key>
-    <key alias="packageCompatDescr">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%</key>
-    <key alias="packageExtSources">External sources</key>
+    <key alias="packageCompatibilityDescription">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%</key>
+    <key alias="packageExternalSources">External sources</key>
     <key alias="packageAuthor">Author</key>
     <key alias="packageDemonstration">Demonstration</key>
     <key alias="packageDocumentation">Documentation</key>
@@ -882,7 +884,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="installStateInstalling">Installing...</key>
     <key alias="installStateRestarting">Restarting, please wait...</key>
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
-    <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload page.</key>
+    <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
     <key alias="installStateUploading">Uploading package...</key>
   </area>
   <area alias="paste">
@@ -952,7 +954,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="imagecropper">
     <key alias="reset">Reset</key>
     <key alias="defineCrop">Define crop</key>
-    <key alias="defineCropDescr">Give the crop an alias and it's default width and height</key>
+    <key alias="defineCropDescription">Give the crop an alias and its default width and height</key>
     <key alias="saveCrop">Save crop</key>
     <key alias="addCrop">Add new crop</key>
   </area>
@@ -1313,19 +1315,22 @@ To manage your website, simply open the Umbraco back office and start adding con
 
   <area alias="templateEditor">
     <key alias="addFallbackField">Add fallback field</key>
+    <key alias="fallbackField">Fallback field</key>
     <key alias="addDefaultValue">Add default value</key>
+    <key alias="defaultValue">Default value</key>
     <key alias="alternativeField">Fallback field</key>
     <key alias="alternativeText">Default value</key>
     <key alias="casing">Casing</key>
     <key alias="encoding">Encoding</key>
     <key alias="chooseField">Choose field</key>
     <key alias="convertLineBreaks">Convert line breaks</key>
+    <key alias="convertLineBreaksDescription">Yes, convert line breaks</key>
     <key alias="convertLineBreaksHelp">Replaces line breaks with 'br' html tag</key>
     <key alias="customFields">Custom Fields</key>
     <key alias="dateOnly">Date only</key>
     <key alias="formatAndEncoding">Format and encoding</key>
     <key alias="formatAsDate">Format as date</key>
-    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, accoring to the active culture</key>
+    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, according to the active culture</key>
     <key alias="htmlEncode">HTML encode</key>
     <key alias="htmlEncodeHelp">Will replace special characters by their HTML equivalent.</key>
     <key alias="insertedAfter">Will be inserted after the field value</key>
@@ -1338,7 +1343,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="preContent">Insert before field</key>
     <key alias="recursive">Recursive</key>
     <key alias="recursiveDescr">Yes, make it recursive</key>
-    <key alias="removeParagraph">Remove Paragraph tags</key>
+    <key alias="removeParagraph">Remove paragraph tags</key>
+    <key alias="removeParagraphDescription">Yes, remove paragraph tags</key>
     <key alias="removeParagraphHelp">Will remove any paragraph tag in the beginning and end of the text</key>
     <key alias="separator">Separator</key>
     <key alias="standardFields">Standard Fields</key>
@@ -1489,13 +1495,13 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="enterCustomValidation">...or enter a custom validation</key>
     <key alias="fieldIsMandatory">Field is mandatory</key>
     <key alias="validationRegExp">Enter a regular expression</key>
-    <key alias="valMinCount">You need to add at least</key>
-    <key alias="valMaxCount">You can only have</key>
-    <key alias="valItems">items</key>
-    <key alias="valItemsSel">items selected</key>
-    <key alias="valInvalidDate">Invalid date</key>
-    <key alias="valInvalidNumber">Not a number</key>
-    <key alias="valInvalidEmail">Invalid email</key>
+    <key alias="minCount">You need to add at least</key>
+    <key alias="maxCount">You can only have</key>
+    <key alias="items">items</key>
+    <key alias="itemsSelected">items selected</key>
+    <key alias="invalidDate">Invalid date</key>
+    <key alias="invalidNumber">Not a number</key>
+    <key alias="invalidEmail">Invalid email</key>
   </area>
   <area alias="healthcheck">
     <!-- The following keys get these tokens passed in:
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index aabca0edce..1a0d55b6c4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -747,7 +747,7 @@
   <area alias="imagecropper">
     <key alias="reset">Сбросить</key>
     <key alias="defineCrop">Задать рамку</key>
-    <key alias="defineCropDescr">Задайте рамке имя (алиас), а также ширину и высоту по-умолчанию</key>
+    <key alias="defineCropDescription">Задайте рамке имя (алиас), а также ширину и высоту по-умолчанию</key>
     <key alias="saveCrop">Сохранить рамку</key>
     <key alias="addCrop">Добавить новую рамку</key>
   </area>
@@ -992,7 +992,7 @@
     <key alias="uploadPackage">Загрузить пакет</key>
     <key alias="localPackageDescr">Установите локальный пакет из файла, расположенного на Вашем компьютере. Остерегайтесь устанавливать пакеты из непроверенных источников!</key>
     <key alias="uploadAnother">Загрузить еще один пакет</key>
-    <key alias="cancelAndAnother">Отменить и загрузить другой пакет</key>
+    <key alias="cancelAndUploadAnother">Отменить и загрузить другой пакет</key>
     <key alias="packageLicense">Лицензия</key>
     <key alias="accept">Я принимаю</key>
     <key alias="termsOfUse">условия использования</key>
@@ -1000,11 +1000,11 @@
     <key alias="installFinish">Завершить</key>
     <key alias="installedPackages">Установленные пакеты</key>
     <key alias="noPackages">Ни одного пакета еще не установлено</key>
-    <key alias="noPackagesDescr"><![CDATA[Вы пока еще не устанавливали ни одного пакета. Вы можете установить как локальный пакет, выбрав файл на Вашем компьютере, так и пакет из репозитория, нажав на значок <strong>'Packages'</strong> наверху справа]]></key>
+    <key alias="noPackagesDescription"><![CDATA[Вы пока еще не устанавливали ни одного пакета. Вы можете установить как локальный пакет, выбрав файл на Вашем компьютере, так и пакет из репозитория, нажав на значок <strong>'Packages'</strong> наверху справа]]></key>
     <key alias="packageSearch">Поиск по пакетам</key>
     <key alias="packageSearchResults">Результаты поиска по</key>
     <key alias="packageNoResults">Ничего не найдено по запросу</key>
-    <key alias="packageNoResultsDescr">Пожалуйста, повторите поиск, уточнив запрос, или воспользуйтесь просмотром по категориям</key>
+    <key alias="packageNoResultsDescription">Пожалуйста, повторите поиск, уточнив запрос, или воспользуйтесь просмотром по категориям</key>
     <key alias="packagesPopular">Популярные</key>
     <key alias="packagesNew">Недавно созданные</key>
     <key alias="packageHas">имеет на счету</key>
@@ -1013,13 +1013,13 @@
     <key alias="packageOwner">Владелец</key>
     <key alias="packageContrib">Соавторы</key>
     <key alias="packageCreated">Создан</key>
-    <key alias="packageCurrVersion">Текущая версия</key>
+    <key alias="packageCurrentVersion">Текущая версия</key>
     <key alias="packageNetVersion">Версия .NET</key>
     <key alias="packageDownloads">Загрузок</key>
     <key alias="packageLikes">Нравится</key>
     <key alias="packageCompatibility">Совместимость</key>
-    <key alias="packageCompatDescr">Этот пакет совместим со следующими версиями Umbraco, по сообщениям участников сообщества. Полная совместимость не гарантируется для версий со значением ниже 100%</key>
-    <key alias="packageExtSources">Внешние источники</key>
+    <key alias="packageCompatibilityDescription">Этот пакет совместим со следующими версиями Umbraco, по сообщениям участников сообщества. Полная совместимость не гарантируется для версий со значением ниже 100%</key>
+    <key alias="packageExternalSources">Внешние источники</key>
     <key alias="packageAuthor">Автор</key>
     <key alias="packageDemonstration">Демонстрация</key>
     <key alias="packageDocumentation">Документация (описание)</key>
@@ -1598,12 +1598,12 @@
     <key alias="enterCustomValidation">...или указать свои правила валидации</key>
     <key alias="fieldIsMandatory">Обязательно к заполнению</key>
     <key alias="validationRegExp">Задайте регулярное выражение</key>
-    <key alias="valMinCount">Необходимо выбрать как минимум</key>
-    <key alias="valMaxCount">Возможно выбрать максимум</key>
-    <key alias="valItems">элементов</key>
-    <key alias="valItemsSel">элементов</key>
-    <key alias="valInvalidDate">Неверный формат даты</key>
-    <key alias="valInvalidNumber">Не является числом</key>
-    <key alias="valInvalidEmail">неверный формат email-адреса</key>
+    <key alias="minCount">Необходимо выбрать как минимум</key>
+    <key alias="maxCount">Возможно выбрать максимум</key>
+    <key alias="items">элементов</key>
+    <key alias="itemsSelected">элементов</key>
+    <key alias="invalidDate">Неверный формат даты</key>
+    <key alias="invalidNumber">Не является числом</key>
+    <key alias="invalidEmail">неверный формат email-адреса</key>
   </area>
 </language>