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 v8/feature/6816-property-actions

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
This commit is contained in:
Niels Lyngsø
2019-10-30 13:24:30 +01:00
parent bef9696628 ff36cf11d1
commit 946fb38924
30 changed files with 204 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -426,6 +426,7 @@
<key alias="linkinternal">Internal link:</key>
<key alias="linklocaltip">When using local links, insert "#" in front of link</key>
<key alias="linknewwindow">Open in new window?</key>
<key alias="macroContainerSettings">Macro Settings</key>
<key alias="macroDoesNotHaveProperties">This macro does not contain any properties you can edit</key>
<key alias="paste">Paste</key>
<key alias="permissionsEdit">Edit permissions for</key>
@@ -537,11 +538,12 @@
<key alias="enterMessage">Enter a message...</key>
<key alias="usernameHint">Your username is usually your email</key>
<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="a11yEdit">Edit</key>
<key alias="a11yName">Name</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>
@@ -1980,8 +1982,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="invalidNumber">Not a number</key>
<key alias="invalidEmail">Invalid email</key>
<key alias="customValidation">Custom validation</key>
<key alias="entriesShort"><![CDATA[Minimum %0% elementer, kræver <strong>%1%</strong> mere.]]></key>
<key alias="entriesExceed"><![CDATA[Maximum %0% elementer, <strong>%1%</strong> for mange.]]></key>
<key alias="entriesShort"><![CDATA[Minimum %0% entries, requires <strong>%1%</strong> more.]]></key>
<key alias="entriesExceed"><![CDATA[Maximum %0% entries, <strong>%1%</strong> too many.]]></key>
</area>
<area alias="healthcheck">
<!-- The following keys get these tokens passed in:
@@ -2165,6 +2167,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="currentLanguage">Current language</key>
<key alias="switchLanguage">Switch language to</key>
<key alias="createNewFolder">Create new folder</key>
<key alias="newPartialView">Partial View</key>
<key alias="newPartialViewMacro">Partial View Macro</key>
<key alias="newMember">Member</key>
</area>
<area alias="references">
<key alias="tabName">References</key>

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

@@ -429,6 +429,7 @@
<key alias="linkinternal">Internal link:</key>
<key alias="linklocaltip">When using local links, insert "#" in front of link</key>
<key alias="linknewwindow">Open in new window?</key>
<key alias="macroContainerSettings">Macro Settings</key>
<key alias="macroDoesNotHaveProperties">This macro does not contain any properties you can edit</key>
<key alias="paste">Paste</key>
<key alias="permissionsEdit">Edit permissions for</key>
@@ -543,6 +544,7 @@
<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>
@@ -1995,7 +1997,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="invalidEmpty">Value cannot be empty</key>
<key alias="invalidPattern">Value is invalid, it does not match the correct pattern</key>
<key alias="customValidation">Custom validation</key>
<key alias="entriesShort"><![CDATA[Minimum %0% entries, needs <strong>%1%</strong> more.]]></key>
<key alias="entriesShort"><![CDATA[Minimum %0% entries, requires <strong>%1%</strong> more.]]></key>
<key alias="entriesExceed"><![CDATA[Maximum %0% entries, <strong>%1%</strong> too many.]]></key>
</area>
<area alias="healthcheck">
@@ -2181,6 +2183,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="currentLanguage">Current language</key>
<key alias="switchLanguage">Switch language to</key>
<key alias="createNewFolder">Create new folder</key>
<key alias="newPartialView">Partial View</key>
<key alias="newPartialViewMacro">Partial View Macro</key>
<key alias="newMember">Member</key>
</area>
<area alias="references">
<key alias="tabName">References</key>