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

Merge branch 'netcore/netcore' into feature/8651-config-options-patten

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
#	src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
This commit is contained in:
Andy Butland
2020-08-27 09:03:01 +02:00
parent 4e222f103e 361125e84b
commit 2a59a8385c
979 changed files with 9486 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1587
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/cs.xml
View File

File diff suppressed because it is too large Load Diff

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

@@ -472,6 +472,7 @@
<key alias="selectMemberType">Vælg medlemstype</key>
<key alias="selectNode">Vælg node</key>
<key alias="selectSections">Vælg sektioner</key>
<key alias="selectUser">Vælg bruger</key>
<key alias="selectUsers">Vælg brugere</key>
<key alias="noIconsFound">Ingen ikoner blev fundet</key>
<key alias="noMacroParams">Der er ingen parametre for denne makro</key>
@@ -1784,8 +1785,10 @@ Mange hilsner fra Umbraco robotten
<key alias="usedByProperties">Brugt af</key>
</area>
<area alias="logViewer">
<key alias="deleteSavedSearch">Slet gemte søgning</key>
<key alias="logLevels">Log type</key>
<key alias="savedSearches">Gemte søgninger</key>
<key alias="saveSearch">Gem søgning</key>
<key alias="saveSearchDescription">Indtast et navn for din søgebetingelse</key>
<key alias="totalItems">Samlet resultat</key>
<key alias="timestamp">Dato</key>
<key alias="level">Type</key>

4
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/de.xml
View File

@@ -4,10 +4,6 @@
<name>The Umbraco community</name>
<link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
</creator>
<!--???-->
<!-- = unklar-->
<!--!!!-->
<!-- = ToDo-->
<area alias="actions">
<key alias="assignDomain">Kulturen und Hostnamen</key>
<key alias="auditTrail">Protokoll</key>

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

@@ -499,6 +499,7 @@
<key alias="selectMemberType">Select member type</key>
<key alias="selectNode">Select node</key>
<key alias="selectSections">Select sections</key>
<key alias="selectUser">Select user</key>
<key alias="selectUsers">Select users</key>
<key alias="noIconsFound">No icons were found</key>
<key alias="noMacroParams">There are no parameters for this macro</key>
@@ -2047,7 +2048,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="validationRegExpMessage">Enter a custom validation error message (optional)</key>
<key alias="minCount">You need to add at least</key>
<key alias="maxCount">You can only have</key>
<key alias="addUpTo">Add up to</key>
<key alias="items">items</key>
<key alias="urls">url(s)</key>
<key alias="urlsSelected">url(s) selected</key>
<key alias="itemsSelected">items selected</key>
<key alias="invalidDate">Invalid date</key>
<key alias="invalidNumber">Not a number</key>
@@ -2265,6 +2269,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="name">Name</key>
<key alias="addNewRow">Add new row</key>
<key alias="tabExpand">View more options</key>
<key alias="hasTranslation">Has translation</key>
<key alias="noTranslation">Missing translation</key>
<key alias="dictionaryListCaption">Dictionary items</key>
</area>
<area alias="references">
<key alias="tabName">References</key>
@@ -2281,32 +2288,36 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="labelUsedByMedia">Used in Media</key>
</area>
<area alias="logViewer">
<key alias="logLevels">Log Levels</key>
<key alias="savedSearches">Saved Searches</key>
<key alias="totalItems">Total Items</key>
<key alias="timestamp">Timestamp</key>
<key alias="level">Level</key>
<key alias="machine">Machine</key>
<key alias="message">Message</key>
<key alias="exception">Exception</key>
<key alias="properties">Properties</key>
<key alias="searchWithGoogle">Search With Google</key>
<key alias="searchThisMessageWithGoogle">Search this message with Google</key>
<key alias="searchWithBing">Search With Bing</key>
<key alias="searchThisMessageWithBing">Search this message with Bing</key>
<key alias="searchOurUmbraco">Search Our Umbraco</key>
<key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Search this message on Our Umbraco forums and docs</key>
<key alias="searchOurUmbracoWithGoogle">Search Our Umbraco with Google</key>
<key alias="searchOurUmbracoForumsUsingGoogle">Search Our Umbraco forums using Google</key>
<key alias="searchUmbracoSource">Search Umbraco Source</key>
<key alias="searchWithinUmbracoSourceCodeOnGithub">Search within Umbraco source code on Github</key>
<key alias="searchUmbracoIssues">Search Umbraco Issues</key>
<key alias="searchUmbracoIssuesOnGithub">Search Umbraco Issues on Github</key>
<key alias="deleteThisSearch">Delete this search</key>
<key alias="findLogsWithRequestId">Find Logs with Request ID</key>
<key alias="findLogsWithNamespace">Find Logs with Namespace</key>
<key alias="findLogsWithMachineName">Find Logs with Machine Name</key>
<key alias="open">Open</key>
<key alias="deleteSavedSearch">Delete Saved Search</key>
<key alias="logLevels">Log Levels</key>
<key alias="savedSearches">Saved Searches</key>
<key alias="saveSearch">Save Search</key>
<key alias="saveSearchDescription">Enter a friendly name for your search query</key>
<key alias="filterSearch">Filter Search</key>
<key alias="totalItems">Total Items</key>
<key alias="timestamp">Timestamp</key>
<key alias="level">Level</key>
<key alias="machine">Machine</key>
<key alias="message">Message</key>
<key alias="exception">Exception</key>
<key alias="properties">Properties</key>
<key alias="searchWithGoogle">Search With Google</key>
<key alias="searchThisMessageWithGoogle">Search this message with Google</key>
<key alias="searchWithBing">Search With Bing</key>
<key alias="searchThisMessageWithBing">Search this message with Bing</key>
<key alias="searchOurUmbraco">Search Our Umbraco</key>
<key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Search this message on Our Umbraco forums and docs</key>
<key alias="searchOurUmbracoWithGoogle">Search Our Umbraco with Google</key>
<key alias="searchOurUmbracoForumsUsingGoogle">Search Our Umbraco forums using Google</key>
<key alias="searchUmbracoSource">Search Umbraco Source</key>
<key alias="searchWithinUmbracoSourceCodeOnGithub">Search within Umbraco source code on Github</key>
<key alias="searchUmbracoIssues">Search Umbraco Issues</key>
<key alias="searchUmbracoIssuesOnGithub">Search Umbraco Issues on Github</key>
<key alias="deleteThisSearch">Delete this search</key>
<key alias="findLogsWithRequestId">Find Logs with Request ID</key>
<key alias="findLogsWithNamespace">Find Logs with Namespace</key>
<key alias="findLogsWithMachineName">Find Logs with Machine Name</key>
<key alias="open">Open</key>
</area>
<area alias="clipboard">
<key alias="labelForCopyAllEntries">Copy %0%</key>
@@ -2316,6 +2327,7 @@ To manage your website, simply open the Umbraco back office and start adding con
</area>
<area alias="propertyActions">
<key alias="tooltipForPropertyActionsMenu">Open Property Actions</key>
<key alias="tooltipForPropertyActionsMenuClose">Close Property Actions</key>
</area>
<area alias="nuCache">
<key alias="wait">Wait</key>

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

@@ -503,6 +503,7 @@
<key alias="selectMemberType">Select member type</key>
<key alias="selectNode">Select node</key>
<key alias="selectSections">Select sections</key>
<key alias="selectUser">Select user</key>
<key alias="selectUsers">Select users</key>
<key alias="noIconsFound">No icons were found</key>
<key alias="noMacroParams">There are no parameters for this macro</key>
@@ -673,6 +674,7 @@
<key alias="continue">Continue</key>
<key alias="copy">Copy</key>
<key alias="create">Create</key>
<key alias="cropSection">Crop section</key>
<key alias="database">Database</key>
<key alias="date">Date</key>
<key alias="default">Default</key>
@@ -2063,7 +2065,10 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="validationRegExpMessage">Enter a custom validation error message (optional)</key>
<key alias="minCount">You need to add at least</key>
<key alias="maxCount">You can only have</key>
<key alias="addUpTo">Add up to</key>
<key alias="items">items</key>
<key alias="urls">url(s)</key>
<key alias="urlsSelected">url(s) selected</key>
<key alias="itemsSelected">items selected</key>
<key alias="invalidDate">Invalid date</key>
<key alias="invalidNumber">Not a number</key>
@@ -2285,6 +2290,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="name">Name</key>
<key alias="addNewRow">Add new row</key>
<key alias="tabExpand">View more options</key>
<key alias="hasTranslation">Has translation</key>
<key alias="noTranslation">Missing translation</key>
<key alias="dictionaryListCaption">Dictionary items</key>
</area>
<area alias="references">
<key alias="tabName">References</key>
@@ -2301,8 +2309,12 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="labelUsedByMedia">Used in Media</key>
</area>
<area alias="logViewer">
<key alias="deleteSavedSearch">Delete Saved Search</key>
<key alias="logLevels">Log Levels</key>
<key alias="savedSearches">Saved Searches</key>
<key alias="saveSearch">Save Search</key>
<key alias="saveSearchDescription">Enter a friendly name for your search query</key>
<key alias="filterSearch">Filter Search</key>
<key alias="totalItems">Total Items</key>
<key alias="timestamp">Timestamp</key>
<key alias="level">Level</key>
@@ -2336,6 +2348,7 @@ To manage your website, simply open the Umbraco back office and start adding con
</area>
<area alias="propertyActions">
<key alias="tooltipForPropertyActionsMenu">Open Property Actions</key>
<key alias="tooltipForPropertyActionsMenuClose">Close Property Actions</key>
</area>
<area alias="nuCache">
<key alias="wait">Wait</key>

619
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/fr.xml
View File

File diff suppressed because it is too large Load Diff

1
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nb.xml
View File

@@ -330,6 +330,7 @@
<key alias="continue">Fortsett</key>
<key alias="copy">Kopier</key>
<key alias="create">Opprett</key>
<key alias="cropSection">Utsnitt</key>
<key alias="database">Database</key>
<key alias="date">Dato</key>
<key alias="default">Standard</key>

2
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nl.xml
View File

@@ -923,7 +923,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
<key alias="insertControl">Item toevoegen</key>
<key alias="chooseLayout">Kies de indeling</key>
<key alias="addRows">Kies een indeling voor deze pagina om content toe te kunnen voegen</key>
<key alias="addElement"><![CDATA[<i class="icon icon-add blue"></i> Plaats een (extra) content blok]]></key>
<key alias="addElement">Plaats een (extra) content blok</key>
<key alias="dropElement">Drop content</key>
<key alias="settingsApplied">Instellingen toegepast</key>
<key alias="contentNotAllowed">Deze content is hier niet toegestaan</key>

2
src/Umbraco.Web.UI.NetCore/umbraco/config/lang/tr.xml
View File

@@ -796,7 +796,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="macro">Macro</key>
<key alias="insertControl">Insert control</key>
<key alias="addRows">Choose a layout for the page</key>
<key alias="addElement"><![CDATA[To start, click the <i class="icon icon-add blue"></i> below and add your first element]]></key>
<key alias="addElement">Add content</key>
<key alias="clickToEmbed">Click to embed</key>
<key alias="clickToInsertImage">Click to insert image</key>
<key alias="placeholderImageCaption">Image caption...</key>