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

Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
This commit is contained in:
Bjarke Berg
2021-01-04 11:18:14 +01:00
parent 2dc72ea323 97cdfc302c
commit 7dbb2dbf9a
10 changed files with 138 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2537,7 +2537,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="openWebsiteLabel">Preview website</key>
<key alias="openWebsiteTitle">Open website in preview mode</key>
<key alias="returnToPreviewHeadline">Preview website?</key>
<key alias="returnToPreviewDescription">ou have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
<key alias="returnToPreviewDescription">You have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
<key alias="returnToPreviewAcceptButton">Preview latest version</key>
<key alias="returnToPreviewDeclineButton">View published version</key>
<key alias="viewPublishedContentHeadline">View published version?</key>

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

@@ -2558,7 +2558,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="openWebsiteLabel">Preview website</key>
<key alias="openWebsiteTitle">Open website in preview mode</key>
<key alias="returnToPreviewHeadline">Preview website?</key>
<key alias="returnToPreviewDescription">ou have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
<key alias="returnToPreviewDescription">You have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
<key alias="returnToPreviewAcceptButton">Preview latest version</key>
<key alias="returnToPreviewDeclineButton">View published version</key>
<key alias="viewPublishedContentHeadline">View published version?</key>