Merge branch 'main' into glitch-soc/merge-upstream

2022-05-26 18:34:27 +02:00
parent 444b650094 088dc0ec5a
commit f13d910f3e
29 changed files with 833 additions and 369 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1546,7 +1546,7 @@
        "id": "compose_form.hashtag_warning"
      },
      {
-        "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+        "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.",
        "id": "compose_form.encryption_warning"
      },
      {
@@ -3724,4 +3724,4 @@
    ],
    "path": "app/javascript/mastodon/features/video/index.json"
  }
-]
+]