yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Abstractions/Constants-AppSettings.cs
#	src/Umbraco.Abstractions/ContentVariationExtensions.cs
#	src/Umbraco.Abstractions/IMainDom.cs
#	src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
#	src/Umbraco.Abstractions/Runtime/IMainDom.cs
#	src/Umbraco.Abstractions/Runtime/MainDom.cs
#	src/Umbraco.Core/IMainDom.cs
#	src/Umbraco.Core/MainDom.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/MainDom.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
#	src/Umbraco.Web/UmbracoApplication.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
This commit is contained in:
Bjarke Berg
2020-01-23 13:16:49 +01:00
parent 0d84bfb42e fd11ef6ed1
commit 1bfb64bdd8
119 changed files with 2682 additions and 1270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -112,6 +112,12 @@
<PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
<PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<ProjectReference Include="..\Umbraco.TestData\Umbraco.TestData.csproj">
<Project>{fb5676ed-7a69-492c-b802-e7b24144c0fc}</Project>
<Name>Umbraco.TestData</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
<Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
View File

@@ -23,7 +23,7 @@
{
if (success)
{
@* This message will show if RedirectOnSucces is set to false (default) *@
@* This message will show if profileModel.RedirectUrl is not defined (default) *@
<p>Profile updated</p>
}

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
View File

@@ -45,7 +45,7 @@
@if (success)
{
@* This message will show if RedirectOnSucces is set to false (default) *@
@* This message will show if registerModel.RedirectUrl is not defined (default) *@
<p>Registration succeeded.</p>
}
else

15
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -35,7 +35,9 @@
<key alias="SetPermissionsForThePage">Sæt rettigheder for siden %0%</key>
<key alias="chooseWhereToCopy">Vælg hvor du vil kopiere</key>
<key alias="chooseWhereToMove">Vælg hvortil du vil flytte</key>
<key alias="infiniteEditorChooseWhereToMove">Vælg hvor du vil flytte de valgte elementer hen</key>
<key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
<key alias="infiniteEditorChooseWhereToCopy">Vælg hvor du vil kopiere de valgte elementer til</key>
<key alias="wasMovedTo">blev flyttet til</key>
<key alias="wasCopiedTo">blev kopieret til</key>
<key alias="wasDeleted">blev slettet</key>
@@ -446,6 +448,7 @@
<key alias="viewCacheItem">Se cache element</key>
<key alias="relateToOriginalLabel">Relatér til original</key>
<key alias="includeDescendants">Inkludér undersider</key>
<key alias="theFriendliestCommunity">Det venligste community</key>
<key alias="linkToPage">Link til side</key>
<key alias="openInNewWindow">Åben linket i et nyt vindue eller fane</key>
<key alias="linkToMedia">Link til medie</key>
@@ -539,9 +542,6 @@
<key alias="anchor">#value eller ?key=value</key>
<key alias="enterAlias">Indtast alias...</key>
<key alias="generatingAlias">Genererer alias...</key>
<key alias="a11yCreateItem">Opret element</key>
<key alias="a11yEdit">Rediger</key>
<key alias="a11yName">Navn</key>
</area>
<area alias="editcontenttype">
<key alias="createListView" version="7.2">Opret brugerdefineret listevisning</key>
@@ -751,6 +751,9 @@
<key alias="current">nuværende</key>
<key alias="embed">Indlejring</key>
<key alias="selected">valgt</key>
<key alias="other">Andet</key>
<key alias="articles">Artikler</key>
<key alias="videos">Videoer</key>
</area>
<area alias="colors">
<key alias="blue">Blå</key>
@@ -1115,7 +1118,10 @@ Mange hilsner fra Umbraco robotten
<key alias="forms">Formularer</key>
</area>
<area alias="help">
<key alias="tours">Tours</key>
<key alias="theBestUmbracoVideoTutorials">De bedste Umbraco video tutorials</key>
<key alias="umbracoForum">Besøg our.umbraco.com</key>
<key alias="umbracoTv">Besøg umbraco.tv</key>
</area>
<area alias="settings">
<key alias="defaulttemplate">Standardskabelon</key>
@@ -1733,6 +1739,9 @@ Mange hilsner fra Umbraco robotten
<key alias="currentLanguage">Aktivt sprog</key>
<key alias="switchLanguage">Skift sprog til</key>
<key alias="createNewFolder">Opret ny mappe</key>
<key alias="createItem">Opret element</key>
<key alias="edit">Rediger</key>
<key alias="name">Navn</key>
</area>
<area alias="references">
<key alias="tabName">Referencer</key>

22
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -36,6 +36,8 @@
<key alias="chooseWhereToCopy">Choose where to copy</key>
<key alias="chooseWhereToMove">Choose where to move</key>
<key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
<key alias="infiniteEditorChooseWhereToCopy">Choose where to copy the selected item(s)</key>
<key alias="infiniteEditorChooseWhereToMove">Choose where to move the selected item(s)</key>
<key alias="wasMovedTo">was moved to</key>
<key alias="wasCopiedTo">was copied to</key>
<key alias="wasDeleted">was deleted</key>
@@ -280,6 +282,9 @@
<key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
<key alias="nestedContentAddElementType">Add element type</key>
<key alias="nestedContentSelectElementTypeModalTitle">Select element type</key>
<key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</key>
<key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
<key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
@@ -759,6 +764,11 @@
<key alias="current">current</key>
<key alias="embed">Embed</key>
<key alias="selected">selected</key>
<key alias="other">Other</key>
<key alias="articles">Articles</key>
<key alias="videos">Videos</key>
<key alias="clear">Clear</key>
<key alias="installing">Installing</key>
</area>
<area alias="colors">
<key alias="blue">Blue</key>
@@ -1339,7 +1349,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="users">Users</key>
</area>
<area alias="help">
<key alias="tours">Tours</key>
<key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
<key alias="umbracoForum">Visit our.umbraco.com</key>
<key alias="umbracoTv">Visit umbraco.tv</key>
</area>
<area alias="settings">
<key alias="defaulttemplate">Default template</key>
@@ -1637,6 +1650,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="elementType">Element type</key>
<key alias="elementHeading">Is an Element type</key>
<key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree.</key>
<key alias="elementCannotToggle">A document type cannot be changed to an Element type once it has been used to create one or more content items.</key>
<key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
<key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
</area>
@@ -2202,6 +2216,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="redirectDashboardSearchLabel">Search the redirect dashboard</key>
<key alias="userGroupSearchLabel">Search the user group section</key>
<key alias="userSearchLabel">Search the users section</key>
<key alias="createItem">Create item</key>
<key alias="create">Create</key>
<key alias="edit">Edit</key>
<key alias="name">Name</key>
</area>
<area alias="references">
<key alias="tabName">References</key>
@@ -2367,5 +2385,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<area alias="startupDashboard">
<key alias="fallbackHeadline">Welcome to The Friendly CMS</key>
<key alias="fallbackDescription">Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</key>
</area>
<area alias="formsDashboard">
<key alias="formsHeadline">Umbraco Forms</key>
<key alias="formsDescription">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</key>
</area>
</language>

32
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -36,6 +36,8 @@
<key alias="chooseWhereToCopy">Choose where to copy</key>
<key alias="chooseWhereToMove">Choose where to move</key>
<key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
<key alias="infiniteEditorChooseWhereToCopy">Choose where to copy the selected item(s)</key>
<key alias="infiniteEditorChooseWhereToMove">Choose where to move the selected item(s)</key>
<key alias="wasMovedTo">was moved to</key>
<key alias="wasCopiedTo">was copied to</key>
<key alias="wasDeleted">was deleted</key>
@@ -284,6 +286,9 @@
<key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
<key alias="nestedContentAddElementType">Add element type</key>
<key alias="nestedContentSelectElementTypeModalTitle">Select element type</key>
<key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</key>
<key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
<key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
@@ -551,10 +556,6 @@
<key alias="anchor">#value or ?key=value</key>
<key alias="enterAlias">Enter alias...</key>
<key alias="generatingAlias">Generating alias...</key>
<key alias="a11yCreateItem">Create item</key>
<key alias="a11yCreate">Create</key>
<key alias="a11yEdit">Edit</key>
<key alias="a11yName">Name</key>
</area>
<area alias="editcontenttype">
<key alias="createListView" version="7.2">Create custom list view</key>
@@ -764,6 +765,11 @@
<key alias="current">current</key>
<key alias="embed">Embed</key>
<key alias="selected">selected</key>
<key alias="other">Other</key>
<key alias="articles">Articles</key>
<key alias="videos">Videos</key>
<key alias="clear">Clear</key>
<key alias="installing">Installing</key>
</area>
<area alias="colors">
<key alias="blue">Blue</key>
@@ -1339,7 +1345,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="users">Users</key>
</area>
<area alias="help">
<key alias="tours">Tours</key>
<key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
<key alias="umbracoForum">Visit our.umbraco.com</key>
<key alias="umbracoTv">Visit umbraco.tv</key>
</area>
<area alias="settings">
<key alias="defaulttemplate">Default template</key>
@@ -1649,9 +1658,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="variantsDescription">Allow editors to create content of this type in different languages.</key>
<key alias="allowVaryByCulture">Allow varying by culture</key>
<key alias="elementType">Element type</key>
<key alias="elementHeading">Is an Element type</key>
<key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree.</key>
<key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
<key alias="elementHeading">Is an element type</key>
<key alias="elementDescription">An element type is meant to be used for instance in Nested Content, and not in the tree.</key>
<key alias="elementCannotToggle">A document type cannot be changed to an element type once it has been used to create one or more content items.</key>
<key alias="elementDoesNotSupport">This is not applicable for an element type</key>
<key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
</area>
<area alias="languages">
@@ -2218,6 +2228,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="redirectDashboardSearchLabel">Search the redirect dashboard</key>
<key alias="userGroupSearchLabel">Search the user group section</key>
<key alias="userSearchLabel">Search the users section</key>
<key alias="createItem">Create item</key>
<key alias="create">Create</key>
<key alias="edit">Edit</key>
<key alias="name">Name</key>
</area>
<area alias="references">
<key alias="tabName">References</key>
@@ -2384,4 +2398,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="fallbackHeadline">Welcome to The Friendly CMS</key>
<key alias="fallbackDescription">Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</key>
</area>
<area alias="formsDashboard">
<key alias="formsHeadline">Umbraco Forms</key>
<key alias="formsDescription">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</key>
</area>
</language>