Merge branch 'dev' of https://github.com/umami-software/umami into dev

# Conflicts: # public/iso-3166-2.json
2023-04-13 22:30:22 -07:00
parent f2edd0d604 44e37ece2d
commit e286994397
17 changed files with 47 additions and 37 deletions
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -758,7 +758,15 @@
  "message.delete-website": [
    {
      "type": 0,
-      "value": "Delete website"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
    }
  ],
  "message.delete-website-warning": [