Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/identity-temp

2020-06-01 15:51:56 +10:00
parent 9904dc6cc2 58c70c3a90
commit 793bbbab5b
104 changed files with 2234 additions and 1161 deletions
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -60,6 +60,7 @@
        <Content Update="Config\umbracoSettings.config">
          <SubType>Designer</SubType>
        </Content>
+        <Content Remove="wwwroot\Web.config" />
    </ItemGroup>

    <ItemGroup>
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
@@ -247,7 +247,7 @@
    <key alias="routeErrorCannotRoute">Dette dokument er udgivet, men dets URL kan ikke dirigeres</key>
    <key alias="publish">Udgiv</key>
    <key alias="published">Udgivet</key>
-    <key alias="publishedPendingChanges">Udgivet (Afventende ændringer)</key>
+    <key alias="publishedPendingChanges">Udgivet (Ventede ændringer)</key>
    <key alias="publishStatus">Udgivelsesstatus</key>
    <key alias="publishDescendantsHelp"><![CDATA[Klik <em>Udgiv med undersider</em> for at udgive <strong>%0%</strong> og alle sider under og dermed gøre deres indhold offentligt tilgængelige.]]></key>
    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Klik <em>Udgiv med undersider</em> for at udgive <strong>de valgte sprog</strong> og de samme sprog for sider under og dermed gøre deres indhold offentligt tilgængelige.]]></key>
@@ -426,6 +426,7 @@
    <key alias="linkinternal">Internt link:</key>
    <key alias="linklocaltip">Ved lokalt link, indsæt da en "#" foran linket</key>
    <key alias="linknewwindow">Åben i nyt vindue?</key>
+    <key alias="macroContainerSettings">Makroindstillinger</key>
    <key alias="macroDoesNotHaveProperties">Denne makro har ingen egenskaber du kan redigere</key>
    <key alias="paste">Indsæt tekst</key>
    <key alias="permissionsEdit">Rediger rettigheder for</key>
@@ -1749,6 +1750,12 @@ Mange hilsner fra Umbraco robotten
    <key alias="openBackofficeSearch">Åben backoffice søgning</key>
    <key alias="openCloseBackofficeHelp">Åben/Luk backoffice hjælp</key>
    <key alias="openCloseBackofficeProfileOptions">Åben/Luk dine profil indstillinger</key>
+    <key alias="assignDomainDescription">Tilføj domæne på %0%</key>
+    <key alias="createDescription">Opret ny node under %0%</key>
+    <key alias="protectDescription">Opsæt offentlig adgang på %0%</key>
+    <key alias="rightsDescription">Opsæt rettigheder på %0%</key>
+    <key alias="sortDescription">Juster soterings rækkefølgen for %0%</key>
+    <key alias="createblueprintDescription">Opret indholds skabelon baseret på %0%</key>
    <key alias="currentLanguage">Aktivt sprog</key>
    <key alias="switchLanguage">Skift sprog til</key>
    <key alias="createNewFolder">Opret ny mappe</key>
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en.xml
@@ -141,6 +141,7 @@
    <key alias="saveToPublish">Save and send for approval</key>
    <key alias="saveListView">Save list view</key>
    <key alias="schedulePublish">Schedule</key>
+    <key alias="showPage">Preview</key>
    <key alias="saveAndPreview">Save and preview</key>
    <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
    <key alias="styleChoose">Choose style</key>
@@ -168,6 +169,7 @@
    <key alias="sendtopublish">Content sent for publishing</key>
    <key alias="sendtopublishvariant">Content sent for publishing for languages: %0%</key>
    <key alias="sort">Sort child items performed by user</key>
+    <key alias="custom">%0%</key>
    <key alias="smallCopy">Copy</key>
    <key alias="smallPublish">Publish</key>
    <key alias="smallPublishVariant">Publish</key>
@@ -180,6 +182,7 @@
    <key alias="smallSendToPublish">Send To Publish</key>
    <key alias="smallSendToPublishVariant">Send To Publish</key>
    <key alias="smallSort">Sort</key>
+    <key alias="smallCustom">Custom</key>
    <key alias="historyIncludingVariants">History (all variants)</key>
  </area>
  <area alias="changeDocType">
@@ -684,6 +687,7 @@
    <key alias="icon">Icon</key>
    <key alias="id">Id</key>
    <key alias="import">Import</key>
+    <key alias="includeFromsubFolders">Include subfolders in search</key>
    <key alias="excludeFromSubFolders">Search only this folder</key>
    <key alias="info">Info</key>
    <key alias="innerMargin">Inner margin</key>
@@ -2226,6 +2230,12 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="openBackofficeSearch">Open backoffice search</key>
    <key alias="openCloseBackofficeHelp">Open/Close backoffice help</key>
    <key alias="openCloseBackofficeProfileOptions">Open/Close your profile options</key>
+    <key alias="assignDomainDescription">Setup Culture and Hostnames for %0%</key>
+    <key alias="createDescription">Create new node under %0%</key>
+    <key alias="protectDescription">Setup Public access on %0%</key>
+    <key alias="rightsDescription">Setup Permissions on %0%</key>
+    <key alias="sortDescription">Change sort order for %0%</key>
+    <key alias="createblueprintDescription">Create Content Template based on %0%</key>
    <key alias="openContextMenu">Open context menu for</key>
    <key alias="currentLanguage">Current language</key>
    <key alias="switchLanguage">Switch language to</key>
@@ -2241,7 +2251,7 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="create">Create</key>
    <key alias="edit">Edit</key>
    <key alias="name">Name</key>
-    <key alias="addNewRow">Add new row</key>    
+    <key alias="addNewRow">Add new row</key>
    <key alias="tabExpand">View more options</key>
  </area>
  <area alias="references">
@@ -2413,4 +2423,21 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="formsHeadline">Umbraco Forms</key>
    <key alias="formsDescription">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</key>
  </area>
+  <area alias="contentTemplatesDashboard">
+    <key alias="whatHeadline">What are Content Templates?</key>
+    <key alias="whatDescription">Content Templates are pre-defined content that can be selected when creating a new content node.</key>
+    <key alias="createHeadline">How do I create a Content Template?</key>
+    <key alias="createDescription">
+        <![CDATA[
+            <p>There are two ways to create a Content Template:</p>
+            <ul>
+                <li>Right-click a content node and select "Create Content Template" to create a new Content Template.</li>
+                <li>Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.</li>
+            </ul>
+            <p>Once given a name, editors can start using the Content Template as a foundation for their new page.</p>
+        ]]>
+    </key>
+    <key alias="manageHeadline">How do I manage Content Templates?</key>
+    <key alias="manageDescription">You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.</key>
+  </area>
 </language>
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
@@ -140,6 +140,7 @@
    <key alias="saveToPublish">Send for approval</key>
    <key alias="saveListView">Save list view</key>
    <key alias="schedulePublish">Schedule</key>
+    <key alias="showPage">Preview</key>
    <key alias="saveAndPreview">Save and preview</key>
    <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
    <key alias="styleChoose">Choose style</key>
@@ -170,6 +171,7 @@
    <key alias="sendtopublish">Content sent for publishing</key>
    <key alias="sendtopublishvariant">Content sent for publishing for languages: %0%</key>
    <key alias="sort">Sort child items performed by user</key>
+    <key alias="custom">%0%</key>
    <key alias="smallCopy">Copy</key>
    <key alias="smallPublish">Publish</key>
    <key alias="smallPublishVariant">Publish</key>
@@ -183,6 +185,7 @@
    <key alias="smallSendToPublish">Send To Publish</key>
    <key alias="smallSendToPublishVariant">Send To Publish</key>
    <key alias="smallSort">Sort</key>
+    <key alias="smallCustom">Custom</key>
    <key alias="historyIncludingVariants">History (all variants)</key>
  </area>
  <area alias="changeDocType">
@@ -367,7 +370,8 @@
    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by changing the <strong>Allow as root</strong> option under <strong>Permissions</strong>.]]></key>
    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
    <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
-    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
+    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
+    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
    <key alias="newFolder">New folder</key>
    <key alias="newDataType">New data type</key>
    <key alias="newJavascriptFile">New JavaScript file</key>
@@ -568,6 +572,9 @@
    <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>
  </area>
  <area alias="editcontenttype">
    <key alias="createListView" version="7.2">Create custom list view</key>
@@ -688,6 +695,7 @@
    <key alias="icon">Icon</key>
    <key alias="id">Id</key>
    <key alias="import">Import</key>
+    <key alias="includeFromsubFolders">Include subfolders in search</key>
    <key alias="excludeFromSubFolders">Search only this folder</key>
    <key alias="info">Info</key>
    <key alias="innerMargin">Inner margin</key>
@@ -2242,6 +2250,12 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="openBackofficeSearch">Open backoffice search</key>
    <key alias="openCloseBackofficeHelp">Open/Close backoffice help</key>
    <key alias="openCloseBackofficeProfileOptions">Open/Close your profile options</key>
+    <key alias="assignDomainDescription">Setup Culture and Hostnames for %0%</key>
+    <key alias="createDescription">Create new node under %0%</key>
+    <key alias="protectDescription">Setup Public access on %0%</key>
+    <key alias="rightsDescription">Setup Permissions on %0%</key>
+    <key alias="sortDescription">Change sort order for %0%</key>
+    <key alias="createblueprintDescription">Create Content Template based on %0%</key>
    <key alias="openContextMenu">Open context menu for</key>
    <key alias="currentLanguage">Current language</key>
    <key alias="switchLanguage">Switch language to</key>
@@ -2429,4 +2443,21 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="formsHeadline">Umbraco Forms</key>
    <key alias="formsDescription">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</key>
  </area>
+  <area alias="contentTemplatesDashboard">
+    <key alias="whatHeadline">What are Content Templates?</key>
+    <key alias="whatDescription">Content Templates are pre-defined content that can be selected when creating a new content node.</key>
+    <key alias="createHeadline">How do I create a Content Template?</key>
+    <key alias="createDescription">
+        <![CDATA[
+            <p>There are two ways to create a Content Template:</p>
+            <ul>
+                <li>Right-click a content node and select "Create Content Template" to create a new Content Template.</li>
+                <li>Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.</li>
+            </ul>
+            <p>Once given a name, editors can start using the Content Template as a foundation for their new page.</p>
+        ]]>
+    </key>
+    <key alias="manageHeadline">How do I manage Content Templates?</key>
+    <key alias="manageDescription">You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.</key>
+  </area>
 </language>