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

Merge remote-tracking branch 'origin/v9/dev' into v10/dev

Browse Source 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Infrastructure/HostedServices/HealthCheckNotifier.cs
#	src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
#	src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TrackedReferencesRepository.cs
#	src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
#	tests/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs
#	tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
This commit is contained in:
Bjarke Berg
2022-03-31 12:39:43 +02:00
parent 3961c4c233 ad51832b5d
commit fe1c2f5d4f
73 changed files with 1908 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -788,6 +788,7 @@
<key alias="new">New</key>
<key alias="next">Next</key>
<key alias="no">No</key>
<key alias="nodeName">Node Name</key>
<key alias="of">of</key>
<key alias="off">Off</key>
<key alias="ok">OK</key>
@@ -829,6 +830,7 @@
<key alias="submit">Submit</key>
<key alias="success">Success</key>
<key alias="type">Type</key>
<key alias="typeName">Type Name</key>
<key alias="typeToSearch">Type to search...</key>
<key alias="under">under</key>
<key alias="up">Up</key>
@@ -1469,6 +1471,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
<key alias="umbracoForum">Visit our.umbraco.com</key>
<key alias="umbracoTv">Visit umbraco.tv</key>
<key alias="umbracoLearningBase">Watch our free tutorial videos</key>
<key alias="umbracoLearningBaseDescription">on the Umbraco Learning Base</key>
</area>
<area alias="settings">
<key alias="defaulttemplate">Default template</key>
@@ -2388,6 +2392,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="parent">Parent</key>
<key alias="child">Child</key>
<key alias="count">Count</key>
<key alias="relation">Relation</key>
<key alias="relations">Relations</key>
<key alias="created">Created</key>
<key alias="comment">Comment</key>
@@ -2468,18 +2473,13 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<area alias="references">
<key alias="tabName">References</key>
<key alias="DataTypeNoReferences">This Data Type has no references.</key>
<key alias="itemHasNoReferences">This item has no references.</key>
<key alias="labelUsedByDocumentTypes">Used in Document Types</key>
<key alias="labelUsedByMediaTypes">Used in Media Types</key>
<key alias="labelUsedByMemberTypes">Used in Member Types</key>
<key alias="usedByProperties">Used by</key>
<key alias="labelUsedByDocuments">Used in Documents</key>
<key alias="labelUsedByMembers">Used in Members</key>
<key alias="labelUsedByMedia">Used in Media</key>
<key alias="labelUsedItems">Items in use</key>
<key alias="labelUsedDescendants">Descendants in use</key>
<key alias="labelUsedInMediaDescendants">One or more of this item's descendants is being used in a media item.</key>
<key alias="labelUsedInContentDescendants">One or more of this item's descendants is being used in a content item.</key>
<key alias="labelUsedInMemberDescendants">One or more of this item's descendants is being used in a member.</key>
<key alias="deleteWarning">This item or its descendants is being used. Deletion can lead to broken links on your website.</key>
<key alias="unpublishWarning">This item or its descendants is being used. Unpublishing can lead to broken links on your website. Please take the appropriate actions.</key>
<key alias="deleteDisabledWarning">This item or its descendants is being used. Therefore, deletion has been disabled.</key>
@@ -2639,7 +2639,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
</key>
<key alias="bulletPointTutorials">
<![CDATA[
Watch our free <a class="btn-link -underline" href="https://www.youtube.com/c/UmbracoLearningBase" target="_blank" rel="noopener">tutorial videos on the Umbraco Learning Base</a>
Watch our free <a class="btn-link -underline" href="https://umbra.co/ulb" target="_blank" rel="noopener">tutorial videos on the Umbraco Learning Base</a>
]]>
</key>
<key alias="bulletPointFour">

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

@@ -809,7 +809,7 @@
<key alias="new">New</key>
<key alias="next">Next</key>
<key alias="no">No</key>
<key alias="nodename">Node Name</key>
<key alias="nodeName">Node Name</key>
<key alias="of">of</key>
<key alias="off">Off</key>
<key alias="ok">OK</key>
@@ -850,7 +850,7 @@
<key alias="submit">Submit</key>
<key alias="success">Success</key>
<key alias="type">Type</key>
<key alias="typename">Type Name</key>
<key alias="typeName">Type Name</key>
<key alias="typeToSearch">Type to search...</key>
<key alias="under">under</key>
<key alias="up">Up</key>
@@ -1494,6 +1494,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
<key alias="umbracoForum">Visit our.umbraco.com</key>
<key alias="umbracoTv">Visit umbraco.tv</key>
<key alias="umbracoLearningBase">Watch our free tutorial videos</key>
<key alias="umbracoLearningBaseDescription">on the Umbraco Learning Base</key>
</area>
<area alias="settings">
<key alias="defaulttemplate">Default template</key>
@@ -2559,16 +2561,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="labelUsedByMemberTypes">Referenced by the following Member Types</key>
<key alias="usedByProperties">Referenced by</key>
<key alias="labelUsedByItems">Referenced by the following items</key>
<key alias="labelDependsOnThis">The following items depends on this</key>
<key alias="labelUsedByDocuments">Referenced by the following Documents</key>
<key alias="labelUsedByMembers">Referenced by the following Members</key>
<key alias="labelUsedByMedia">Referenced by the following Media</key>
<key alias="labelDependsOnThis">The following items depend on this</key>
<key alias="labelUsedItems">The following items are referenced</key>
<key alias="labelUsedDescendants">The following descending items are referenced</key>
<key alias="labelDependentDescendants">The following descending items has dependencies</key>
<key alias="labelUsedInMediaDescendants">One or more of this item's descendants is being referenced in a media item.</key>
<key alias="labelUsedInContentDescendants">One or more of this item's descendants is being referenced in a content item.</key>
<key alias="labelUsedInMemberDescendants">One or more of this item's descendants is being referenced in a member.</key>
<key alias="labelUsedDescendants">The following descendant items have dependencies</key>
<key alias="labelDependentDescendants">The following descending items have dependencies</key>
<key alias="deleteWarning">This item or its descendants is being referenced. Deletion can lead to broken links on your website.</key>
<key alias="unpublishWarning">This item or its descendants is being referenced. Unpublishing can lead to broken links on your website. Please take the appropriate actions.</key>
<key alias="deleteDisabledWarning">This item or its descendants is being referenced. Therefore, deletion has been disabled.</key>
@@ -2728,7 +2724,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
</key>
<key alias="bulletPointTutorials">
<![CDATA[
Watch our free <a class="btn-link -underline" href="https://www.youtube.com/c/UmbracoLearningBase" target="_blank" rel="noopener">tutorial videos on the Umbraco Learning Base</a>
Watch our free <a class="btn-link -underline" href="https://umbra.co/ulb" target="_blank" rel="noopener">tutorial videos on the Umbraco Learning Base</a>
]]>
</key>
<key alias="bulletPointFour">