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

Merge branch 'v8/feature/media-tracking' into v8/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
This commit is contained in:
Warren Buckley
2020-01-22 08:36:32 +00:00
parent 8030901184 4cf204f8f5
commit 81a0a52874
119 changed files with 3629 additions and 1348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,6 +113,12 @@
</PackageReference>
<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.Core\Umbraco.Core.csproj">
<Project>{31785bc3-256c-4613-b2f5-a1b0bdded8c1}</Project>

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

@@ -553,6 +553,10 @@
<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>
@@ -1643,10 +1647,11 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="variantsHeading">Allow varying by culture</key>
<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="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="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>
<area alias="languages">
@@ -2226,6 +2231,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="labelUsedByMemberTypes">Used in Member Types</key>
<key alias="noMemberTypes">No references to 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>
</area>
<area alias="logViewer">
<key alias="logLevels">Log Levels</key>

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

@@ -2243,6 +2243,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="labelUsedByMemberTypes">Used in Member Types</key>
<key alias="noMemberTypes">No references to 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>
</area>
<area alias="logViewer">
<key alias="logLevels">Log Levels</key>