From 2f31175db595083ecdaef9ce232a31dd2d8ea656 Mon Sep 17 00:00:00 2001
From: Sebastiaan Jansssen <sebastiaan@umbraco.com>
Date: Mon, 19 Feb 2018 14:20:47 +0100
Subject: [PATCH 1/2] Bump version to 7.7.12

---
 src/SolutionInfo.cs                              | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 335d5fb8b8..d78730ba66 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.7.11")]
-[assembly: AssemblyInformationalVersion("7.7.11")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("7.7.12")]
+[assembly: AssemblyInformationalVersion("7.7.12")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 7542e77002..08b556a018 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.7.11");
+        private static readonly Version Version = new Version("7.7.12");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e0c7fcec6a..d28b84c172 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1023,9 +1023,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7711</DevelopmentServerPort>
+          <DevelopmentServerPort>7712</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7711</IISUrl>
+          <IISUrl>http://localhost:7712</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 9ec424735015616cbbb5d74f6ddc45f4cdb4f67a Mon Sep 17 00:00:00 2001
From: Sebastiaan Jansssen <sebastiaan@umbraco.com>
Date: Mon, 19 Feb 2018 15:24:50 +0100
Subject: [PATCH 2/2] Sync en and en_us - normalize whitespace

---
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 27 ++++++++++++-----
 .../umbraco/config/lang/en_us.xml             | 30 +++++++++----------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 551efbe8de..50b31ff52f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -127,6 +127,7 @@
         <key alias="returnToList">Return to list</key>
         <key alias="save">Save</key>
         <key alias="saveAndPublish">Save and publish</key>
+        <key alias="saveAndSchedule">Save and schedule</key>
         <key alias="saveToPublish">Save and send for approval</key>
         <key alias="saveListView">Save list view</key>
         <key alias="showPage">Preview</key>
@@ -186,14 +187,18 @@
         <key alias="membergroup">Member Group</key>
         <key alias="memberrole">Role</key>
         <key alias="membertype">Member Type</key>
+        <key alias="noChanges">No changes have been made</key>
         <key alias="noDate">No date chosen</key>
         <key alias="nodeName">Page title</key>
+        <key alias="noMediaLink">This media item has no link</key>
         <key alias="otherElements">Properties</key>
         <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
         <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
         <key alias="getUrlException">Could not get the url</key>
         <key alias="routeError">This document is published but its url would collide with content %0%</key>
         <key alias="publish">Publish</key>
+        <key alias="published">Published</key>
+        <key alias="publishedPendingChanges">Published (pending changes)</key>
         <key alias="publishStatus">Publication Status</key>
         <key alias="releaseDate">Publish at</key>
         <key alias="unpublishDate">Unpublish at</key>
@@ -206,6 +211,7 @@
         <key alias="altTextOptional">Alternative text (optional)</key>
         <key alias="type">Type</key>
         <key alias="unPublish">Unpublish</key>
+        <key alias="unpublished">Unpublished</key>
         <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>
@@ -550,12 +556,15 @@
         <key alias="error">Error</key>
         <key alias="findDocument">Find</key>
         <key alias="first">First</key>
+        <key alias="general">General</key>
         <key alias="groups">Groups</key>
         <key alias="height">Height</key>
         <key alias="help">Help</key>
         <key alias="hide">Hide</key>
+        <key alias="history">History</key>
         <key alias="icon">Icon</key>
         <key alias="import">Import</key>
+        <key alias="info">Info</key>
         <key alias="innerMargin">Inner margin</key>
         <key alias="insert">Insert</key>
         <key alias="install">Install</key>
@@ -565,6 +574,7 @@
         <key alias="language">Language</key>
         <key alias="last">Last</key>
         <key alias="layout">Layout</key>
+        <key alias="links">Links</key>
         <key alias="loading">Loading</key>
         <key alias="locked">Locked</key>
         <key alias="login">Login</key>
@@ -603,6 +613,7 @@
         <key alias="retrieve">Retrieve</key>
         <key alias="retry">Retry</key>
         <key alias="rights">Permissions</key>
+        <key alias="scheduledPublishing">Scheduled Publishing</key>
         <key alias="search">Search</key>
         <key alias="searchNoResult">Sorry, we can not find what you are looking for</key>
         <key alias="noItemsInList">No items have been added</key>
@@ -638,7 +649,7 @@
         <key alias="saving">Saving...</key>
         <key alias="current">current</key>
         <key alias="embed">Embed</key>
-    <key alias="retrieve">Retrieve</key>
+        <key alias="retrieve">Retrieve</key>
         <key alias="selected">selected</key>
     </area>
 
@@ -1506,12 +1517,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     </area>
 
     <area alias="grid">
-		<key alias="rte">Rich Text Editor</key>
-		<key alias="media">Image</key>
-		<key alias="macro">Macro</key>
-		<key alias="embed">Embed</key>
-		<key alias="headline">Headline</key>
-		<key alias="quote">Quote</key>	
+        <key alias="rte">Rich Text Editor</key>
+        <key alias="media">Image</key>
+        <key alias="macro">Macro</key>
+        <key alias="embed">Embed</key>
+        <key alias="headline">Headline</key>
+        <key alias="quote">Quote</key>
         <key alias="insertControl">Choose type of content</key>
         <key alias="chooseLayout">Choose a layout</key>
         <key alias="addRows">Add a row</key>
@@ -1549,8 +1560,8 @@ To manage your website, simply open the Umbraco back office and start adding con
 
         <key alias="allowAllEditors">Allow all editors</key>
         <key alias="allowAllRowConfigurations">Allow all row configurations</key>
-        <key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
         <key alias="maxItems">Maximum items</key>
+        <key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
         <key alias="setAsDefault">Set as default</key>
         <key alias="chooseExtra">Choose extra</key>
         <key alias="chooseDefault">Choose default</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 5a4490d8b1..cab8037aad 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -127,7 +127,7 @@
         <key alias="returnToList">Return to list</key>
         <key alias="save">Save</key>
         <key alias="saveAndPublish">Save and publish</key>
-    <key alias="saveAndSchedule">Save and schedule</key>
+        <key alias="saveAndSchedule">Save and schedule</key>
         <key alias="saveToPublish">Save and send for approval</key>
         <key alias="saveListView">Save list view</key>
         <key alias="showPage">Preview</key>
@@ -187,10 +187,10 @@
         <key alias="membergroup">Member Group</key>
         <key alias="memberrole">Role</key>
         <key alias="membertype">Member Type</key>
-    <key alias="noChanges">No changes have been made</key>
+        <key alias="noChanges">No changes have been made</key>
         <key alias="noDate">No date chosen</key>
         <key alias="nodeName">Page title</key>
-    <key alias="noMediaLink">This media item has no link</key>
+        <key alias="noMediaLink">This media item has no link</key>
         <key alias="otherElements">Properties</key>
         <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
         <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
@@ -556,15 +556,15 @@
         <key alias="error">Error</key>
         <key alias="findDocument">Find</key>
         <key alias="first">First</key>
-    <key alias="general">General</key>
+        <key alias="general">General</key>
         <key alias="groups">Groups</key>
         <key alias="height">Height</key>
         <key alias="help">Help</key>
         <key alias="hide">Hide</key>
-    <key alias="history">History</key>
+        <key alias="history">History</key>
         <key alias="icon">Icon</key>
         <key alias="import">Import</key>
-    <key alias="info">Info</key>
+        <key alias="info">Info</key>
         <key alias="innerMargin">Inner margin</key>
         <key alias="insert">Insert</key>
         <key alias="install">Install</key>
@@ -574,7 +574,7 @@
         <key alias="language">Language</key>
         <key alias="last">Last</key>
         <key alias="layout">Layout</key>
-    <key alias="links">Links</key>
+        <key alias="links">Links</key>
         <key alias="loading">Loading</key>
         <key alias="locked">Locked</key>
         <key alias="login">Login</key>
@@ -613,7 +613,7 @@
         <key alias="retrieve">Retrieve</key>
         <key alias="retry">Retry</key>
         <key alias="rights">Permissions</key>
-    <key alias="scheduledPublishing">Scheduled Publishing</key>
+        <key alias="scheduledPublishing">Scheduled Publishing</key>
         <key alias="search">Search</key>
         <key alias="searchNoResult">Sorry, we can not find what you are looking for</key>
         <key alias="noItemsInList">No items have been added</key>
@@ -649,7 +649,7 @@
         <key alias="saving">Saving...</key>
         <key alias="current">current</key>
         <key alias="embed">Embed</key>
-    <key alias="retrieve">Retrieve</key>
+        <key alias="retrieve">Retrieve</key>
         <key alias="selected">selected</key>
     </area>
     <area alias="colors">
@@ -1512,12 +1512,12 @@ 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="rte">Rich Text Editor</key>
-		<key alias="media">Image</key>
-		<key alias="macro">Macro</key>
-		<key alias="embed">Embed</key>
-		<key alias="headline">Headline</key>
-		<key alias="quote">Quote</key>	
+        <key alias="rte">Rich Text Editor</key>
+        <key alias="media">Image</key>
+        <key alias="macro">Macro</key>
+        <key alias="embed">Embed</key>
+        <key alias="headline">Headline</key>
+        <key alias="quote">Quote</key>
         <key alias="insertControl">Choose type of content</key>
         <key alias="chooseLayout">Choose a layout</key>
         <key alias="addRows">Add a row</key>