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

Merge remote-tracking branch 'origin/dev-v7' into temp8

Browse Source
This commit is contained in:
Sebastiaan Janssen
2018-06-06 22:36:22 +02:00
parent 9008e6af88 0eceb3c7fc
commit 6e8214e697
11 changed files with 203 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1521,6 +1521,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="showOnMemberProfileDescription">Allow this property value to be displayed on the member profile page</key>
<key alias="tabHasNoSortOrder">tab has no sort order</key>
<key alias="compositionUsageHeading">Where is this composition used?</key>
<key alias="compositionUsageSpecification">This composition is currently used in the composition of the following content types:</key>
</area>
<area alias="modelsBuilder">

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

@@ -1646,6 +1646,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="showOnMemberProfileDescription">Allow this property value to be displayed on the member profile page</key>
<key alias="tabHasNoSortOrder">tab has no sort order</key>
<key alias="compositionUsageHeading">Where is this composition used?</key>
<key alias="compositionUsageSpecification">This composition is currently used in the composition of the following content types:</key>
</area>
<area alias="languages">