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

2020-06-26 13:02:14 +02:00
parent 8f4aff9b6f 08cf81f8c1
commit a01674fb2b
52 changed files with 650 additions and 394 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1117,6 +1117,9 @@ en:
    spam_detected: This is an automated report. Spam has been detected.
  statuses:
    attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audio"
      description: 'Attached: %{attached}'
      image:
        one: "%{count} image"