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

Merge pull request #11568 from umbraco/v9/feature/merge_v8_03-11-2021

Browse Source 
V9: Merge v8: 03-11-2021
This commit is contained in:
Bjarke Berg
2021-11-03 12:56:23 +01:00
committed by GitHub
parent f694a09a0c a91d708bc5
commit 109487f117
15 changed files with 332 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,6 +282,7 @@
name. Use
</key>
<key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
<key alias="nestedContentNoGroups">The selected element type does not contain any supported groups (tabs are not supported by this editor, either change them to groups or use the Block List editor).</key>
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
@@ -325,6 +326,7 @@
<key alias="clickToUpload">Click to upload</key>
<key alias="orClickHereToUpload">or click here to choose files</key>
<key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
<key alias="invalidFileName">Cannot upload this file, it does not have a valid file name</key>
<key alias="maxFileSize">Max file size is</key>
<key alias="mediaRoot">Media root</key>
<key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
@@ -848,6 +850,7 @@
<key alias="avatar">Avatar for</key>
<key alias="header">Header</key>
<key alias="systemField">system field</key>
<key alias="lastUpdated">Last Updated</key>
</area>
<area alias="colors">
<key alias="blue">Blue</key>
@@ -1168,7 +1171,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
%6%
Have a nice day!
Cheers from the Umbraco robot
]]></key>
<key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
@@ -1912,7 +1914,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
http://%3%
Have a nice day!
Cheers from the Umbraco robot
]]></key>
<key alias="noTranslators">No translator users found. Please create a translator user before you start sending

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

@@ -286,6 +286,7 @@
name. Use
</key>
<key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
<key alias="nestedContentNoGroups">The selected element type does not contain any supported groups (tabs are not supported by this editor, either change them to groups or use the Block List editor).</key>
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
@@ -329,6 +330,7 @@
<key alias="clickToUpload">Click to upload</key>
<key alias="orClickHereToUpload">or click here to choose files</key>
<key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
<key alias="invalidFileName">Cannot upload this file, it does not have a valid file name</key>
<key alias="maxFileSize">Max file size is</key>
<key alias="mediaRoot">Media root</key>
<key alias="moveToSameFolderFailed">Parent and destination folders cannot be the same</key>
@@ -869,6 +871,7 @@
<key alias="avatar">Avatar for</key>
<key alias="header">Header</key>
<key alias="systemField">system field</key>
<key alias="lastUpdated">Last Updated</key>
</area>
<area alias="colors">
<key alias="blue">Blue</key>