Skip to content

Commit 16b0e85

Browse files
Merge branch 'v8/dev' into v9/dev
# 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
2 parents 7f061bd + b876771 commit 16b0e85

File tree

4 files changed

+5
-1
lines changed

4 files changed

+5
-1
lines changed

src/Umbraco.Web.UI/umbraco/config/lang/cy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@
449449
<key alias="assignDomain">Gweinyddu enwau gwesteia</key>
450450
<key alias="closeThisWindow">Cau'r ffenestr yma</key>
451451
<key alias="confirmdelete">Ydych chi'n sicr eich bod eisiau dileu</key>
452-
<key alias="confirmdeleteXofX">Wyt ti'n siŵr fod ti eisiau dileu %0% yn seiliedig ar %1%</key>
452+
<key alias="confirmdeleteNumberOfItems"><![CDATA[Wyt ti'n siŵr fod ti eisiau dileu <b>%0%</b> yn seiliedig ar <b>%1%</b>]]></key>
453453

454454
<key alias="confirmdisable">Ydych chi'n sicr eich bod eisiau analluogi</key>
455455

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@
461461
<key alias="assignDomain">Manage hostnames</key>
462462
<key alias="closeThisWindow">Close this window</key>
463463
<key alias="confirmdelete">Are you sure you want to delete</key>
464+
<key alias="confirmdeleteNumberOfItems"><![CDATA[Are you sure you want to delete <b>%0%</b> of <b>%1%</b> items]]></key>
464465
<key alias="confirmdisable">Are you sure you want to disable</key>
465466
<key alias="confirmremove">Are you sure you want to remove</key>
466467
<key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>
@@ -560,6 +561,7 @@
560561
</area>
561562
<area alias="dictionary">
562563
<key alias="noItems">There are no dictionary items.</key>
564+
<key alias="createNew">Create dictionary item</key>
563565
</area>
564566
<area alias="dictionaryItem">
565567
<key alias="description"><![CDATA[

src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@
471471
<key alias="anchorInsert">Name</key>
472472
<key alias="closeThisWindow">Close this window</key>
473473
<key alias="confirmdelete">Are you sure you want to delete</key>
474+
<key alias="confirmdeleteNumberOfItems"><![CDATA[Are you sure you want to delete <b>%0%</b> of <b>%1%</b> items]]></key>
474475
<key alias="confirmdisable">Are you sure you want to disable</key>
475476
<key alias="confirmremove">Are you sure you want to remove</key>
476477
<key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>
@@ -571,6 +572,7 @@
571572
</area>
572573
<area alias="dictionary">
573574
<key alias="noItems">There are no dictionary items.</key>
575+
<key alias="createNew">Create dictionary item</key>
574576
</area>
575577
<area alias="dictionaryItem">
576578
<key alias="description"><![CDATA[

0 commit comments

Comments
 (0)