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

2022-07-22 09:58:35 +02:00
parent 0a61b000e3 76ff452306
commit d799fe2082
50 changed files with 983 additions and 662 deletions
@@ -290,7 +290,11 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+        "defaultMessage": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+        "id": "hashtag.total_volume"
+      },
+      {
+        "defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
        "id": "trends.counter_by_accounts"
      }
    ],
@@ -3765,4 +3769,4 @@
    ],
    "path": "app/javascript/mastodon/features/video/index.json"
  }
-]
+]