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

2022-08-15 14:33:05 +02:00
parent 3f15326a05 113dd90aa3
commit e2a7a458d6
159 changed files with 1537 additions and 1316 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1078,6 +1078,18 @@
      {
        "defaultMessage": "Download file",
        "id": "video.download"
+      },
+      {
+        "defaultMessage": "Hide audio",
+        "id": "audio.hide"
+      },
+      {
+        "defaultMessage": "Sensitive content",
+        "id": "status.sensitive_warning"
+      },
+      {
+        "defaultMessage": "Media hidden",
+        "id": "status.media_hidden"
      }
    ],
    "path": "app/javascript/mastodon/features/audio/index.json"