Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts: # build/NuSpecs/UmbracoCms.Web.nuspec # src/SolutionInfo.cs # src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs # src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs # src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts # src/Umbraco.Tests.AcceptanceTest/package.json # src/Umbraco.Tests/TestHelpers/TestObjects.cs # src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs # src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs # src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs # src/Umbraco.Web.BackOffice/Controllers/MediaController.cs # src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs # src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs # src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs # src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js # src/Umbraco.Web.UI.Client/src/installer/steps/database.html # src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less # src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less # src/Umbraco.Web.UI.Client/src/less/forms.less # src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html # src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html # src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html # src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html # src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js # src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html # src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html # src/Umbraco.Web.UI.Client/src/views/dictionary/list.html # src/Umbraco.Web.UI.Client/src/views/logViewer/search.html # src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js # src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js # src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js # src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js # src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js # src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml # src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml # src/Umbraco.Web.UI/config/umbracoSettings.config # src/Umbraco.Web/Editors/BackOfficeServerVariables.cs # src/Umbraco.Web/Editors/DictionaryController.cs # src/Umbraco.Web/Editors/LogController.cs # src/Umbraco.Web/Editors/MediaTypeController.cs # src/Umbraco.Web/Editors/MemberGroupController.cs
This commit is contained in:
Bjarke Berg
File diff suppressed because it is too large
Load Diff
@@ -285,7 +285,7 @@
|
||||
<key alias="addTextBox">Tilføj en ny tekstboks</key>
|
||||
<key alias="removeTextBox">Fjern denne tekstboks</key>
|
||||
<key alias="contentRoot">Indholdsrod</key>
|
||||
<key alias="includeUnpublished">Medtag udkast: udgiv også ikke-publicerede sider.</key>
|
||||
<key alias="includeUnpublished">Inkluder ikke-udgivet indhold.</key>
|
||||
<key alias="isSensitiveValue">Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din web-administrator.</key>
|
||||
<key alias="isSensitiveValue_short">Denne værdi er skjult.</key>
|
||||
<key alias="languagesToPublishForFirstTime">Hvilke sprog vil du gerne udgive? Alle sprog med indhold gemmes!</key>
|
||||
@@ -1845,8 +1845,9 @@ Mange hilsner fra Umbraco robotten
|
||||
<key alias="addCustomView">Tilføj speciel visning</key>
|
||||
<key alias="addSettingsElementType">Tilføj instillinger</key>
|
||||
<key alias="labelTemplatePlaceholder">Overskriv label form</key>
|
||||
<key alias="confirmDeleteBlockMessage"><![CDATA[Er du sikker på at du vil slette denne blok: <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockNotice">Indhold der benytter sig af denne blok vil gå bort.</key>
|
||||
<key alias="confirmDeleteBlockMessage"><![CDATA[Er du sikker på at du vil slette dette indhold: <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockTypeMessage"><![CDATA[Er du sikker på at du vil slette denne blok konfiguration: <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockTypeNotice">Indholdet vil stadigt eksistere, men redigering af dette indhold vil ikke være muligt. Indholdet vil blive vist som ikke understøttet indhold.</key>
|
||||
<key alias="blockConfigurationOverlayTitle"><![CDATA[Konfiguration af '%0%']]></key>
|
||||
<key alias="thumbnail">Billede</key>
|
||||
<key alias="addThumbnail">Tilføj billede</key>
|
||||
@@ -1856,6 +1857,8 @@ Mange hilsner fra Umbraco robotten
|
||||
<key alias="headlineAdvanced">Avanceret</key>
|
||||
<key alias="forceHideContentEditor">Skjuld indholds editoren</key>
|
||||
<key alias="blockHasChanges">Du har lavet ændringer til dette indhold. Er du sikker på at du vil kassere dem?</key>
|
||||
<key alias="confirmCancelBlockCreationHeadline">Annuller oprettelse?</key>
|
||||
<key alias="confirmCancelBlockCreationMessage"><![CDATA[Er du sikker på at du vil annullere oprettelsen.]]></key>
|
||||
</area>
|
||||
|
||||
</language>
|
||||
|
||||
@@ -295,7 +295,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 and unpublished content items.</key>
|
||||
<key alias="includeUnpublished">Include 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>
|
||||
@@ -514,6 +514,9 @@
|
||||
<key alias="selectEditor">Select editor</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>
|
||||
<key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
|
||||
<key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
|
||||
<key alias="yesRemove">Yes, remove</key>
|
||||
</area>
|
||||
<area alias="dictionary">
|
||||
<key alias="noItems">There are no dictionary items.</key>
|
||||
@@ -1600,10 +1603,12 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="gridLayouts">Grid Layouts</key>
|
||||
<key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
|
||||
<key alias="addGridLayout">Add Grid Layout</key>
|
||||
<key alias="editGridLayout">Edit Grid Layout</key>
|
||||
<key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
|
||||
<key alias="rowConfigurations">Row configurations</key>
|
||||
<key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
|
||||
<key alias="addRowConfiguration">Add row configuration</key>
|
||||
<key alias="editRowConfiguration">Edit row configuration</key>
|
||||
<key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
|
||||
<key alias="columns">Columns</key>
|
||||
<key alias="columnsDetails">Total combined number of columns in the grid layout</key>
|
||||
@@ -2470,8 +2475,9 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="addCustomView">Add custom view</key>
|
||||
<key alias="addSettingsElementType">Add settings</key>
|
||||
<key alias="labelTemplatePlaceholder">Overwrite label template</key>
|
||||
<key alias="confirmDeleteBlockMessage"><![CDATA[Are you sure you want to delete block of <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockNotice">Content using this block will be lost.</key>
|
||||
<key alias="confirmDeleteBlockMessage"><![CDATA[Are you sure you want to delete content of <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockTypeMessage"><![CDATA[Are you sure you want to delete block configuration of <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockTypeNotice">The content of this block will still be present, editing of this content will no longer be available and will be shown as unsupported content.</key>
|
||||
<key alias="blockConfigurationOverlayTitle"><![CDATA[Configuration of '%0%']]></key>
|
||||
<key alias="thumbnail">Thumbnail</key>
|
||||
<key alias="addThumbnail">Add thumbnail</key>
|
||||
@@ -2481,6 +2487,8 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="headlineAdvanced">Advanced</key>
|
||||
<key alias="forceHideContentEditor">Force hide content editor</key>
|
||||
<key alias="blockHasChanges">You have made changes to this content. Are you sure you want to discard them?</key>
|
||||
<key alias="confirmCancelBlockCreationHeadline">Discard creation?</key>
|
||||
<key alias="confirmCancelBlockCreationMessage"><![CDATA[Are you sure you want to cancel the creation.]]></key>
|
||||
</area>
|
||||
<area alias="contentTemplatesDashboard">
|
||||
<key alias="whatHeadline">What are Content Templates?</key>
|
||||
|
||||
@@ -300,7 +300,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 and unpublished content items.</key>
|
||||
<key alias="includeUnpublished">Include 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>
|
||||
@@ -354,6 +354,7 @@
|
||||
<key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
|
||||
<key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
|
||||
<key alias="dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</key>
|
||||
<key alias="uploadNotAllowed">Upload is not allowed in this location.</key>
|
||||
</area>
|
||||
<area alias="member">
|
||||
<key alias="createNewMember">Create a new member</key>
|
||||
@@ -519,6 +520,9 @@
|
||||
<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>
|
||||
<key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
|
||||
<key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
|
||||
<key alias="yesRemove">Yes, remove</key>
|
||||
</area>
|
||||
<area alias="dictionary">
|
||||
<key alias="noItems">There are no dictionary items.</key>
|
||||
@@ -1617,10 +1621,12 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="gridLayouts">Grid Layouts</key>
|
||||
<key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
|
||||
<key alias="addGridLayout">Add Grid Layout</key>
|
||||
<key alias="editGridLayout">Edit Grid Layout</key>
|
||||
<key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
|
||||
<key alias="rowConfigurations">Row configurations</key>
|
||||
<key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
|
||||
<key alias="addRowConfiguration">Add row configuration</key>
|
||||
<key alias="editRowConfiguration">Edit row configuration</key>
|
||||
<key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
|
||||
<key alias="columns">Columns</key>
|
||||
<key alias="columnsDetails">Total combined number of columns in the grid layout</key>
|
||||
@@ -2491,8 +2497,9 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="addCustomView">Add custom view</key>
|
||||
<key alias="addSettingsElementType">Add settings</key>
|
||||
<key alias="labelTemplatePlaceholder">Overwrite label template</key>
|
||||
<key alias="confirmDeleteBlockMessage"><![CDATA[Are you sure you want to delete block of <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockNotice">Content using this block will be lost.</key>
|
||||
<key alias="confirmDeleteBlockMessage"><![CDATA[Are you sure you want to delete content of <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockTypeMessage"><![CDATA[Are you sure you want to delete block configuration of <strong>%0%</strong>.]]></key>
|
||||
<key alias="confirmDeleteBlockTypeNotice">The content of this block will still be present, editing of this content will no longer be available and will be shown as unsupported content.</key>
|
||||
<key alias="blockConfigurationOverlayTitle"><![CDATA[Configuration of '%0%']]></key>
|
||||
<key alias="thumbnail">Thumbnail</key>
|
||||
<key alias="addThumbnail">Add thumbnail</key>
|
||||
@@ -2502,6 +2509,8 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="headlineAdvanced">Advanced</key>
|
||||
<key alias="forceHideContentEditor">Force hide content editor</key>
|
||||
<key alias="blockHasChanges">You have made changes to this content. Are you sure you want to discard them?</key>
|
||||
<key alias="confirmCancelBlockCreationHeadline">Discard creation?</key>
|
||||
<key alias="confirmCancelBlockCreationMessage"><![CDATA[Are you sure you want to cancel the creation.]]></key>
|
||||
</area>
|
||||
<area alias="contentTemplatesDashboard">
|
||||
<key alias="whatHeadline">What are Content Templates?</key>
|
||||
|
||||
Reference in New Issue
Block a user