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 netcore/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
This commit is contained in:
Bjarke Berg
2020-05-11 08:23:59 +02:00
parent 4bafa25e23 aff41762ac
commit 3c622905ba
100 changed files with 2622 additions and 1652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -8,7 +8,8 @@
<key alias="assignDomain">Tilføj domæne</key>
<key alias="auditTrail">Revisionsspor</key>
<key alias="browse">Gennemse elementer</key>
<key alias="changeDocType">Skift dokumenttype</key>
<key alias="changeDocType">Skift Dokument Type</key>
<key alias="changeDataType">Skift Input Type</key>
<key alias="copy">Kopier</key>
<key alias="create">Opret</key>
<key alias="export">Eksportér</key>
@@ -479,6 +480,7 @@
<key alias="unLinkYour">Fjern link fra dit</key>
<key alias="account">konto</key>
<key alias="selectEditor">Vælg editor</key>
<key alias="selectEditorConfiguration">Vælg konfiguration</key>
<key alias="selectSnippet">Vælg snippet</key>
<key alias="variantdeletewarning">Dette vil slette noden og alle dets sprog. Hvis du kun vil slette et sprog, så afpublicér det i stedet.</key>
</area>
@@ -780,6 +782,7 @@
<key alias="generalHeader">Generelt</key>
<key alias="editorHeader">Editor</key>
<key alias="toggleAllowCultureVariants">Skift tillad sprogvarianter</key>
<key alias="toggleAllowSegmentVariants">Skift tillad segmentering</key>
</area>
<area alias="graphicheadline">
<key alias="backgroundcolor">Baggrundsfarve</key>
@@ -1378,9 +1381,11 @@ Mange hilsner fra Umbraco robotten
<key alias="compositionInUse">Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition</key>
<key alias="noAvailableCompositions">Der er ingen indholdstyper tilgængelige at bruge som komposition</key>
<key alias="compositionRemoveWarning">Når du fjerner en komposition vil alle associerede indholdsdata blive slettet. Når først dokumenttypen er gemt, er der ingen vej tilbage.</key>
<key alias="availableEditors">Tilgængelige editors</key>
<key alias="availableEditors">Opret ny indstilling</key>
<key alias="reuse">Genbrug</key>
<key alias="editorSettings">Editor indstillinger</key>
<key alias="editorSettings">Input indstillinger</key>
<key alias="searchResultSettings">Tilgængelige indstillinger</key>
<key alias="searchResultEditors">Opret ny indstilling</key>
<key alias="configuration">Konfiguration</key>
<key alias="yesDelete">Ja, slet</key>
<key alias="movedUnderneath">blev flyttet til</key>
@@ -1406,9 +1411,16 @@ Mange hilsner fra Umbraco robotten
<key alias="tabHasNoSortOrder">fane har ingen sorteringsrækkefølge</key>
<key alias="compositionUsageHeading">Hvor er denne komposition brugt?</key>
<key alias="compositionUsageSpecification">Denne komposition brugt i kompositionen af de følgende indholdstyper:</key>
<key alias="variantsHeading">Tillad sprogvariation</key>
<key alias="variantsHeading">Tillad variationer</key>
<key alias="cultureVariantHeading">Tillad sprogvariation</key>
<key alias="segmentVariantHeading">Tillad segmentering</key>
<key alias="cultureVariantLabel">Tillader sprogvariationer</key>
<key alias="segmentVariantLabel">Tillader segmentering</key>
<key alias="variantsDescription">Tillad at redaktører kan oprette indhold af denne type på flere sprog.</key>
<key alias="cultureVariantDescription">Tillad at redaktører kan oprette dette indhold på flere sprog.</key>
<key alias="segmentVariantDescription">Tillad at redaktører kan oprette flere udgaver af denne type indhold.</key>
<key alias="allowVaryByCulture">Tillad sprogvariation</key>
<key alias="allowVaryBySegment">Tillad segmentering</key>
<key alias="elementType">Element-type</key>
<key alias="elementHeading">Er en Element-type</key>
<key alias="elementDescription">En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet.</key>

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

@@ -250,8 +250,8 @@
<key alias="published">Published</key>
<key alias="publishedPendingChanges">Published (pending changes)</key>
<key alias="publishStatus">Publication Status</key>
<key alias="publishDescendantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
<key alias="publishDescendantsWithVariantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>the selected languages</strong> and the same languages of content items underneath and thereby making their content publicly available.]]></key>
<key alias="publishDescendantsHelp"><![CDATA[Publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
<key alias="publishDescendantsWithVariantsHelp"><![CDATA[Publish variants and variants of same type underneath and thereby making their content publicly available.]]></key>
<key alias="releaseDate">Publish at</key>
<key alias="unpublishDate">Unpublish at</key>
<key alias="removeDate">Clear Date</key>
@@ -288,7 +288,7 @@
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
<key alias="includeUnpublished">Include drafts: also publish unpublished content items.</key>
<key alias="includeUnpublished">Include drafts and unpublished content items.</key>
<key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
<key alias="isSensitiveValue_short">This value is hidden.</key>
<key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
@@ -302,7 +302,17 @@
<key alias="unpublishedLanguages">Unpublished Languages</key>
<key alias="unmodifiedLanguages">Unmodified Languages</key>
<key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
<key alias="readyToPublish">Ready to Publish?</key>
<key alias="variantsWillBeSaved">All new variants will be saved.</key>
<key alias="variantsToPublish">Which variants you would like to publish?</key>
<key alias="variantsToSave">Choose which variants to be saved.</key>
<key alias="variantsToSendForApproval">Pick variants to send for approval.</key>
<key alias="variantsToSchedule">Set scheduled publishing...</key>
<key alias="variantsToUnpublish">Select the variants to unpublish. Unpublishing a mandatory language will unpublish all variants.</key>
<key alias="publishRequiresVariants">The following variants is required for publishing to take place:</key>
<key alias="notReadyToPublish">We are not ready to Publish</key>
<key alias="readyToPublish">Ready to publish?</key>
<key alias="readyToSave">Ready to Save?</key>
<key alias="sendForApproval">Send for approval</key>
<key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
@@ -796,6 +806,7 @@
<key alias="generalHeader">General</key>
<key alias="editorHeader">Editor</key>
<key alias="toggleAllowCultureVariants">Toggle allow culture variants</key>
<key alias="toggleAllowSegmentVariants">Toggle allow segmentation</key>
</area>
<area alias="graphicheadline">
<key alias="backgroundcolor">Background colour</key>
@@ -1646,9 +1657,16 @@ To manage your website, simply open the Umbraco back office and start adding con
<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>
<key alias="variantsHeading">Allow varying by culture</key>
<key alias="variantsHeading">Allow variations</key>
<key alias="cultureVariantHeading">Allow vary by culture</key>
<key alias="segmentVariantHeading">Allow segmentation</key>
<key alias="cultureVariantLabel">Vary by culture</key>
<key alias="segmentVariantLabel">Vary by segments</key>
<key alias="variantsDescription">Allow editors to create content of this type in different languages.</key>
<key alias="cultureVariantDescription">Allow editors to create content of different languages.</key>
<key alias="segmentVariantDescription">Allow editors to create segments of this content.</key>
<key alias="allowVaryByCulture">Allow varying by culture</key>
<key alias="allowVaryBySegment">Allow segmentation</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>

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

@@ -9,6 +9,7 @@
<key alias="auditTrail">Audit Trail</key>
<key alias="browse">Browse Node</key>
<key alias="changeDocType">Change Document Type</key>
<key alias="changeDataType">Change Data Type</key>
<key alias="copy">Copy</key>
<key alias="create">Create</key>
<key alias="export">Export</key>
@@ -253,8 +254,8 @@
<key alias="published">Published</key>
<key alias="publishedPendingChanges">Published (pending changes)</key>&gt;
<key alias="publishStatus">Publication Status</key>
<key alias="publishDescendantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
<key alias="publishDescendantsWithVariantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>the selected languages</strong> and the same languages of content items underneath and thereby making their content publicly available.]]></key>
<key alias="publishDescendantsHelp"><![CDATA[Publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
<key alias="publishDescendantsWithVariantsHelp"><![CDATA[Publish variants and variants of same type underneath and thereby making their content publicly available.]]></key>
<key alias="releaseDate">Publish at</key>
<key alias="unpublishDate">Unpublish at</key>
<key alias="removeDate">Clear Date</key>
@@ -292,7 +293,7 @@
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
<key alias="includeUnpublished">Include drafts: also publish unpublished content items.</key>
<key alias="includeUnpublished">Include drafts and unpublished content items.</key>
<key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
<key alias="isSensitiveValue_short">This value is hidden.</key>
<key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
@@ -306,7 +307,17 @@
<key alias="unpublishedLanguages">Unpublished Languages</key>
<key alias="unmodifiedLanguages">Unmodified Languages</key>
<key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
<key alias="readyToPublish">Ready to Publish?</key>
<key alias="variantsWillBeSaved">All new variants will be saved.</key>
<key alias="variantsToPublish">Which variants you would like to publish?</key>
<key alias="variantsToSave">Choose which variants to be saved.</key>
<key alias="variantsToSendForApproval">Pick variants to send for approval.</key>
<key alias="variantsToSchedule">Set scheduled publishing...</key>
<key alias="variantsToUnpublish">Select the variants to unpublish. Unpublishing a mandatory language will unpublish all variants.</key>
<key alias="publishRequiresVariants">The following variants is required for publishing to take place:</key>
<key alias="notReadyToPublish">We are not ready to Publish</key>
<key alias="readyToPublish">Ready to publish?</key>
<key alias="readyToSave">Ready to Save?</key>
<key alias="sendForApproval">Send for approval</key>
<key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
@@ -493,6 +504,7 @@
<key alias="unLinkYour">Un-link your</key>
<key alias="account">account</key>
<key alias="selectEditor">Select editor</key>
<key alias="selectEditorConfiguration">Select configuration</key>
<key alias="selectSnippet">Select snippet</key>
<key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead.</key>
</area>
@@ -797,6 +809,7 @@
<key alias="generalHeader">General</key>
<key alias="editorHeader">Editor</key>
<key alias="toggleAllowCultureVariants">Toggle allow culture variants</key>
<key alias="toggleAllowSegmentVariants">Toggle allow segmentation</key>
</area>
<area alias="graphicheadline">
<key alias="backgroundcolor">Background color</key>
@@ -1631,6 +1644,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="availableEditors">Create new</key>
<key alias="reuse">Use existing</key>
<key alias="editorSettings">Editor settings</key>
<key alias="searchResultSettings">Available configurations</key>
<key alias="searchResultEditors">Create a new configuration</key>
<key alias="configuration">Configuration</key>
<key alias="yesDelete">Yes, delete</key>
<key alias="movedUnderneath">was moved underneath</key>
@@ -1656,9 +1671,16 @@ To manage your website, simply open the Umbraco back office and start adding con
<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>
<key alias="variantsHeading">Allow varying by culture</key>
<key alias="variantsHeading">Allow variations</key>
<key alias="cultureVariantHeading">Allow vary by culture</key>
<key alias="segmentVariantHeading">Allow segmentation</key>
<key alias="cultureVariantLabel">Vary by culture</key>
<key alias="segmentVariantLabel">Vary by segments</key>
<key alias="variantsDescription">Allow editors to create content of this type in different languages.</key>
<key alias="cultureVariantDescription">Allow editors to create content of different languages.</key>
<key alias="segmentVariantDescription">Allow editors to create segments of this content.</key>
<key alias="allowVaryByCulture">Allow varying by culture</key>
<key alias="allowVaryBySegment">Allow segmentation</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>