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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
This commit is contained in:
Bjarke Berg
2020-08-11 10:05:55 +02:00
parent 0fe50728df 1481804014
commit 7b6d64872f
7 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

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

@@ -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>

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

@@ -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>