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

Fixes merge conflicts

Browse Source
This commit is contained in:
Bjarke Berg
2020-08-07 14:00:56 +02:00
parent 9cafeaf39e 39162f0f6a
commit c57c42d2ec
237 changed files with 29451 additions and 4202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
<key alias="createGroup">Opret gruppe</key>
<key alias="delete">Slet</key>
<key alias="disable">Deaktivér</key>
<key alias="editSettings">Edit settings</key>
<key alias="emptyRecycleBin">Tøm papirkurv</key>
<key alias="enable">Aktivér</key>
<key alias="exportDocumentType">Eksportér dokumenttype</key>
@@ -152,6 +153,8 @@
<key alias="confirmActionCancel">Fortryd</key>
<key alias="confirmActionConfirm">Bekræft</key>
<key alias="morePublishingOptions">Flere publiseringsmuligheder</key>
<key alias="submitChanges">Indsæt</key>
<key alias="submitChangesAndClose">Indsæt og luk</key>
</area>
<area alias="auditTrails">
<key alias="atViewingFor">For</key>
@@ -607,6 +610,7 @@
<key alias="tableColMergeLeft">Du skal stå til venstre for de 2 celler du ønsker at samle!</key>
<key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
<key alias="propertyHasErrors">Denne egenskab er ugyldig</key>
<key alias="errorPropertyEditorNotSupportedInElementTypes">Feltet %0% bruger editor %1% som ikke er supporteret for ElementTyper.</key>
</area>
<area alias="general">
<key alias="about">Om</key>
@@ -1809,8 +1813,43 @@ Mange hilsner fra Umbraco robotten
<key alias="labelForCopyAllEntries">Kopier %0%</key>
<key alias="labelForArrayOfItemsFrom">%0% fra %1%</key>
<key alias="labelForRemoveAllEntries">Fjern alle elementer</key>
<key alias="labelForClearClipboard">Ryd udklipsholder</key>
</area>
<area alias="propertyActions">
<key alias="tooltipForPropertyActionsMenu">Åben egenskabshandlinger</key>
</area>
<area alias="blockEditor">
<key alias="headlineCreateBlock">Opret ny blok</key>
<key alias="headlineAddSettingsElementType">Tilføj en indstillings afsnit</key>
<key alias="headlineAddCustomView">Tilføj visning</key>
<key alias="headlineAddCustomStylesheet">Tilføj stylesheet</key>
<key alias="headlineAddThumbnail">Vælg billede</key>
<key alias="labelcreateNewElementType">Opret ny</key>
<key alias="labelCustomStylesheet">Overskriv stylesheet</key>
<key alias="addCustomStylesheet">Tilføj stylesheet</key>
<key alias="headlineEditorAppearance">Redigerings udseende</key>
<key alias="headlineDataModels">Data modeller</key>
<key alias="headlineCatalogueAppearance">katalog udseende</key>
<key alias="labelBackgroundColor">Baggrunds farve</key>
<key alias="labelIconColor">Ikon farve</key>
<key alias="labelContentElementType">Indholds model</key>
<key alias="labelLabelTemplate">Label</key>
<key alias="labelCustomView">Speciel visning</key>
<key alias="labelSettingsElementType">Indstillings model</key>
<key alias="labelEditorSize">Rederings lagets størrelse</key>
<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="blockConfigurationOverlayTitle"><![CDATA[Konfiguration af '%0%']]></key>
<key alias="thumbnail">Billede</key>
<key alias="addThumbnail">Tilføj billede</key>
<key alias="tabCreateEmpty">Opret ny</key>
<key alias="tabClipboard">Udklipsholder</key>
<key alias="tabBlockSettings">Indstillinger</key>
<key alias="headlineAdvanced">Avanceret</key>
<key alias="forceHideContentEditor">Skjuld indholds editoren</key>
</area>
</language>

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

File diff suppressed because it is too large Load Diff

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

@@ -17,6 +17,7 @@
<key alias="createGroup">Create group</key>
<key alias="delete">Delete</key>
<key alias="disable">Disable</key>
<key alias="editSettings">Edit settings</key>
<key alias="emptyRecycleBin">Empty recycle bin</key>
<key alias="enable">Enable</key>
<key alias="exportDocumentType">Export Document Type</key>
@@ -31,6 +32,7 @@
<key alias="unpublish">Unpublish</key>
<key alias="refreshNode">Reload</key>
<key alias="republish">Republish entire site</key>
<key alias="remove">Remove</key>
<key alias="rename" version="7.3.0">Rename</key>
<key alias="restore" version="7.3.0">Restore</key>
<key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
@@ -155,6 +157,8 @@
<key alias="confirmActionCancel">Cancel</key>
<key alias="confirmActionConfirm">Confirm</key>
<key alias="morePublishingOptions">More publishing options</key>
<key alias="submitChanges">Submit</key>
<key alias="submitChangesAndClose">Submit and close</key>
</area>
<area alias="auditTrails">
<key alias="atViewingFor">Viewing for</key>
@@ -433,6 +437,9 @@
<key alias="closeThisWindow">Close this window</key>
<key alias="confirmdelete">Are you sure you want to delete</key>
<key alias="confirmdisable">Are you sure you want to disable</key>
<key alias="confirmremove">Are you sure you want to remove</key>
<key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>
<key alias="confirmremovereferenceto"><![CDATA[Are you sure you want to remove the reference to <b>%0%</b>]]></key>
<key alias="confirmlogout">Are you sure?</key>
<key alias="confirmSure">Are you sure?</key>
<key alias="cut">Cut</key>
@@ -637,6 +644,7 @@
<key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
<key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
<key alias="propertyHasErrors">This property is invalid</key>
<key alias="errorPropertyEditorNotSupportedInElementTypes">Property '%0%' uses editor '%1%' which is not supported in Element Types.</key>
</area>
<area alias="general">
<key alias="options">Options</key>
@@ -2323,6 +2331,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="labelForCopyAllEntries">Copy %0%</key>
<key alias="labelForArrayOfItemsFrom">%0% from %1%</key>
<key alias="labelForRemoveAllEntries">Remove all items</key>
<key alias="labelForClearClipboard">Clear clipboard</key>
</area>
<area alias="propertyActions">
<key alias="tooltipForPropertyActionsMenu">Open Property Actions</key>
@@ -2446,6 +2455,39 @@ 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="blockEditor">
<key alias="headlineCreateBlock">Create new block</key>
<key alias="headlineAddSettingsElementType">Attach a settings section</key>
<key alias="headlineAddCustomView">Select view</key>
<key alias="headlineAddCustomStylesheet">Select stylesheet</key>
<key alias="headlineAddThumbnail">Choose thumbnail</key>
<key alias="labelcreateNewElementType">Create new</key>
<key alias="labelCustomStylesheet">Custom stylesheet</key>
<key alias="addCustomStylesheet">Add stylesheet</key>
<key alias="headlineEditorAppearance">Editor apperance</key>
<key alias="headlineDataModels">Data models</key>
<key alias="headlineCatalogueAppearance">Catalogue appearance</key>
<key alias="labelBackgroundColor">Background color</key>
<key alias="labelIconColor">Icon color</key>
<key alias="labelContentElementType">Content model</key>
<key alias="labelLabelTemplate">Label</key>
<key alias="labelCustomView">Custom view</key>
<key alias="labelSettingsElementType">Settings model</key>
<key alias="labelEditorSize">Overlay editor size</key>
<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="blockConfigurationOverlayTitle"><![CDATA[Configuration of '%0%']]></key>
<key alias="thumbnail">Thumbnail</key>
<key alias="addThumbnail">Add thumbnail</key>
<key alias="tabCreateEmpty">Create empty</key>
<key alias="tabClipboard">Clipboard</key>
<key alias="tabBlockSettings">Settings</key>
<key alias="headlineAdvanced">Advanced</key>
<key alias="forceHideContentEditor">Force hide content editor</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>

126
src/Umbraco.Web.UI.NetCore/appsettings.json
View File

@@ -1,123 +1,5 @@
{
"ConnectionStrings": {
"umbracoDbDSN": ""
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*",
"Umbraco": {
"CMS": {
"Hosting": {
"Debug": true
},
"RuntimeMinification": {
"dataFolder": "App_Data/TEMP/Smidge",
"version": "637212411755687059"
},
"Imaging": {
"Resize": {
"MaxWidth": 5000,
"MaxHeight": 5000
},
"Cache": {
"Folder": "../App_Data/Cache",
"MaxBrowserCacheDays": 7,
"MaxCacheDays": 365,
"CachedNameLength": 8
}
},
"HealthChecks": {
"DisabledChecks": [
{
"id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
"disabledBy": 1,
"disabledOn": "2020-03-15 19:19:10"
}
],
"NotificationSettings": {
"Enabled": true,
"FirstRunTime": "",
"PeriodInHours": 24,
"NotificationMethods": {
"Email": {
"Enabled": true,
"Verbosity": "Summary",
"Settings": {
"RecipientEmail": ""
}
}
},
"DisabledChecks": [
{
"id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
"disabledBy": 1,
"disabledOn": "2020-03-15 19:19:10"
}
]
}
},
"Tours": {
"EnableTours": true
},
"Core": {
"Debug": {}
},
"Content": {
"Errors": {
"Error404": {
"default": "1047",
"en-US": "$site/error [@name = 'error']",
"en-UK": "8560867F-B88F-4C74-A9A4-679D8E5B3BFC"
}
},
"LoginBackgroundImage": "assets/img/login.jpg"
},
"RequestHandler": {
"AddTrailingSlash": true,
"CharCollection": [
{
"Char": " ",
"Replacement": "-"
},
{
"Char": "\"",
"Replacement": ""
},
{
"Char": "'",
"Replacement": ""
},
{
"Char": "%",
"Replacement": ""
},
{
"Char": ".",
"Replacement": ""
},
{
"Char": ";",
"Replacement": ""
},
{
"Char": "/",
"Replacement": ""
},
{
"Char": "\\",
"Replacement": ""
},
{
"Char": ":",
"Replacement": ""
}
]
}
}
}
}
"ConnectionStrings": {
"umbracoDbDSN": "Server=(LocalDB)\\Umbraco;Database=NetCore;Integrated Security=true"
}
}