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

Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9

Browse Source
This commit is contained in:
Sebastiaan Jansssen
2018-02-19 15:38:28 +01:00
parent 325cefa349 567c0977d0
commit 4a5a8497b4
2 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,7 @@
<key alias="returnToList">Return to list</key>
<key alias="save">Save</key>
<key alias="saveAndPublish">Save and publish</key>
<key alias="saveAndSchedule">Save and schedule</key>
<key alias="saveToPublish">Save and send for approval</key>
<key alias="saveListView">Save list view</key>
<key alias="showPage">Preview</key>
@@ -186,14 +187,18 @@
<key alias="membergroup">Member Group</key>
<key alias="memberrole">Role</key>
<key alias="membertype">Member Type</key>
<key alias="noChanges">No changes have been made</key>
<key alias="noDate">No date chosen</key>
<key alias="nodeName">Page title</key>
<key alias="noMediaLink">This media item has no link</key>
<key alias="otherElements">Properties</key>
<key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
<key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
<key alias="getUrlException">Could not get the url</key>
<key alias="routeError">This document is published but its url would collide with content %0%</key>
<key alias="publish">Publish</key>
<key alias="published">Published</key>
<key alias="publishedPendingChanges">Published (pending changes)</key>
<key alias="publishStatus">Publication Status</key>
<key alias="releaseDate">Publish at</key>
<key alias="unpublishDate">Unpublish at</key>
@@ -206,6 +211,7 @@
<key alias="altTextOptional">Alternative text (optional)</key>
<key alias="type">Type</key>
<key alias="unPublish">Unpublish</key>
<key alias="unpublished">Unpublished</key>
<key alias="updateDate">Last edited</key>
<key alias="updateDateDesc" version="7.0">Date/time this document was edited</key>
<key alias="uploadClear">Remove file(s)</key>
@@ -552,12 +558,15 @@
<key alias="error">Error</key>
<key alias="findDocument">Find</key>
<key alias="first">First</key>
<key alias="general">General</key>
<key alias="groups">Groups</key>
<key alias="height">Height</key>
<key alias="help">Help</key>
<key alias="hide">Hide</key>
<key alias="history">History</key>
<key alias="icon">Icon</key>
<key alias="import">Import</key>
<key alias="info">Info</key>
<key alias="innerMargin">Inner margin</key>
<key alias="insert">Insert</key>
<key alias="install">Install</key>
@@ -567,6 +576,7 @@
<key alias="language">Language</key>
<key alias="last">Last</key>
<key alias="layout">Layout</key>
<key alias="links">Links</key>
<key alias="loading">Loading</key>
<key alias="locked">Locked</key>
<key alias="login">Login</key>
@@ -605,6 +615,7 @@
<key alias="retrieve">Retrieve</key>
<key alias="retry">Retry</key>
<key alias="rights">Permissions</key>
<key alias="scheduledPublishing">Scheduled Publishing</key>
<key alias="search">Search</key>
<key alias="searchNoResult">Sorry, we can not find what you are looking for</key>
<key alias="noItemsInList">No items have been added</key>
@@ -640,7 +651,7 @@
<key alias="saving">Saving...</key>
<key alias="current">current</key>
<key alias="embed">Embed</key>
<key alias="retrieve">Retrieve</key>
<key alias="retrieve">Retrieve</key>
<key alias="selected">selected</key>
</area>
@@ -1508,12 +1519,12 @@ To manage your website, simply open the Umbraco back office and start adding con
</area>
<area alias="grid">
<key alias="rte">Rich Text Editor</key>
<key alias="media">Image</key>
<key alias="macro">Macro</key>
<key alias="embed">Embed</key>
<key alias="headline">Headline</key>
<key alias="quote">Quote</key>
<key alias="rte">Rich Text Editor</key>
<key alias="media">Image</key>
<key alias="macro">Macro</key>
<key alias="embed">Embed</key>
<key alias="headline">Headline</key>
<key alias="quote">Quote</key>
<key alias="insertControl">Choose type of content</key>
<key alias="chooseLayout">Choose a layout</key>
<key alias="addRows">Add a row</key>
@@ -1551,8 +1562,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="allowAllEditors">Allow all editors</key>
<key alias="allowAllRowConfigurations">Allow all row configurations</key>
<key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
<key alias="maxItems">Maximum items</key>
<key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
<key alias="setAsDefault">Set as default</key>
<key alias="chooseExtra">Choose extra</key>
<key alias="chooseDefault">Choose default</key>

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

@@ -127,7 +127,7 @@
<key alias="returnToList">Return to list</key>
<key alias="save">Save</key>
<key alias="saveAndPublish">Save and publish</key>
<key alias="saveAndSchedule">Save and schedule</key>
<key alias="saveAndSchedule">Save and schedule</key>
<key alias="saveToPublish">Save and send for approval</key>
<key alias="saveListView">Save list view</key>
<key alias="showPage">Preview</key>
@@ -187,10 +187,10 @@
<key alias="membergroup">Member Group</key>
<key alias="memberrole">Role</key>
<key alias="membertype">Member Type</key>
<key alias="noChanges">No changes have been made</key>
<key alias="noChanges">No changes have been made</key>
<key alias="noDate">No date chosen</key>
<key alias="nodeName">Page title</key>
<key alias="noMediaLink">This media item has no link</key>
<key alias="noMediaLink">This media item has no link</key>
<key alias="otherElements">Properties</key>
<key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
<key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
@@ -558,15 +558,15 @@
<key alias="error">Error</key>
<key alias="findDocument">Find</key>
<key alias="first">First</key>
<key alias="general">General</key>
<key alias="general">General</key>
<key alias="groups">Groups</key>
<key alias="height">Height</key>
<key alias="help">Help</key>
<key alias="hide">Hide</key>
<key alias="history">History</key>
<key alias="history">History</key>
<key alias="icon">Icon</key>
<key alias="import">Import</key>
<key alias="info">Info</key>
<key alias="info">Info</key>
<key alias="innerMargin">Inner margin</key>
<key alias="insert">Insert</key>
<key alias="install">Install</key>
@@ -576,7 +576,7 @@
<key alias="language">Language</key>
<key alias="last">Last</key>
<key alias="layout">Layout</key>
<key alias="links">Links</key>
<key alias="links">Links</key>
<key alias="loading">Loading</key>
<key alias="locked">Locked</key>
<key alias="login">Login</key>
@@ -615,7 +615,7 @@
<key alias="retrieve">Retrieve</key>
<key alias="retry">Retry</key>
<key alias="rights">Permissions</key>
<key alias="scheduledPublishing">Scheduled Publishing</key>
<key alias="scheduledPublishing">Scheduled Publishing</key>
<key alias="search">Search</key>
<key alias="searchNoResult">Sorry, we can not find what you are looking for</key>
<key alias="noItemsInList">No items have been added</key>
@@ -651,7 +651,7 @@
<key alias="saving">Saving...</key>
<key alias="current">current</key>
<key alias="embed">Embed</key>
<key alias="retrieve">Retrieve</key>
<key alias="retrieve">Retrieve</key>
<key alias="selected">selected</key>
</area>
<area alias="colors">
@@ -1514,12 +1514,12 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="template">Template</key>
</area>
<area alias="grid">
<key alias="rte">Rich Text Editor</key>
<key alias="media">Image</key>
<key alias="macro">Macro</key>
<key alias="embed">Embed</key>
<key alias="headline">Headline</key>
<key alias="quote">Quote</key>
<key alias="rte">Rich Text Editor</key>
<key alias="media">Image</key>
<key alias="macro">Macro</key>
<key alias="embed">Embed</key>
<key alias="headline">Headline</key>
<key alias="quote">Quote</key>
<key alias="insertControl">Choose type of content</key>
<key alias="chooseLayout">Choose a layout</key>
<key alias="addRows">Add a row</key>