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

Merge branch 'v8/dev' into v9/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts
#	src/Umbraco.Tests.AcceptanceTest/cypress/support/commands.js
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
This commit is contained in:
Sebastiaan Janssen
2021-11-03 17:12:33 +01:00
parent 7f061bd818 b876771a75
commit 16b0e85ccb
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -449,7 +449,7 @@
<key alias="assignDomain">Gweinyddu enwau gwesteia</key>
<key alias="closeThisWindow">Cau'r ffenestr yma</key>
<key alias="confirmdelete">Ydych chi'n sicr eich bod eisiau dileu</key>
<key alias="confirmdeleteXofX">Wyt ti'n siŵr fod ti eisiau dileu %0% yn seiliedig ar %1%</key>
<key alias="confirmdeleteNumberOfItems"><![CDATA[Wyt ti'n siŵr fod ti eisiau dileu <b>%0%</b> yn seiliedig ar <b>%1%</b>]]></key>
<key alias="confirmdisable">Ydych chi'n sicr eich bod eisiau analluogi</key>

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

@@ -461,6 +461,7 @@
<key alias="assignDomain">Manage hostnames</key>
<key alias="closeThisWindow">Close this window</key>
<key alias="confirmdelete">Are you sure you want to delete</key>
<key alias="confirmdeleteNumberOfItems"><![CDATA[Are you sure you want to delete <b>%0%</b> of <b>%1%</b> items]]></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>
@@ -560,6 +561,7 @@
</area>
<area alias="dictionary">
<key alias="noItems">There are no dictionary items.</key>
<key alias="createNew">Create dictionary item</key>
</area>
<area alias="dictionaryItem">
<key alias="description"><![CDATA[

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

@@ -471,6 +471,7 @@
<key alias="anchorInsert">Name</key>
<key alias="closeThisWindow">Close this window</key>
<key alias="confirmdelete">Are you sure you want to delete</key>
<key alias="confirmdeleteNumberOfItems"><![CDATA[Are you sure you want to delete <b>%0%</b> of <b>%1%</b> items]]></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>
@@ -571,6 +572,7 @@
</area>
<area alias="dictionary">
<key alias="noItems">There are no dictionary items.</key>
<key alias="createNew">Create dictionary item</key>
</area>
<area alias="dictionaryItem">
<key alias="description"><![CDATA[