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/netcore

Browse Source 
# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
This commit is contained in:
Bjarke Berg
2020-12-07 11:56:38 +01:00
parent 1a35cf5164 7ff0f9ee20
commit 5dbddfffc5
46 changed files with 851 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
View File

@@ -1438,6 +1438,8 @@ Mange hilsner fra Umbraco robotten
<key alias="elementDescription">En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet.</key>
<key alias="elementDoesNotSupport">Dette benyttes ikke for en Element-type</key>
<key alias="propertyHasChanges">Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?</key>
<key alias="displaySettingsHeadline">Visning</key>
<key alias="displaySettingsLabelOnTop">Flyt label over editoren</key>
</area>
<area alias="languages">
<key alias="addLanguage">Tilføj sprog</key>

2
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
View File

@@ -1698,6 +1698,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<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>
<key alias="displaySettingsHeadline">Appearance</key>
<key alias="displaySettingsLabelOnTop">Display label on top of editor.</key>
</area>
<area alias="languages">
<key alias="addLanguage">Add language</key>

2
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
View File

@@ -1716,6 +1716,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<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>
<key alias="displaySettingsHeadline">Appearance</key>
<key alias="displaySettingsLabelOnTop">Display label on top of editor.</key>
</area>
<area alias="languages">
<key alias="addLanguage">Add language</key>