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

2022-02-19 11:33:18 +01:00
parent c8ef003c6b 2e89067d21
commit dc121b609f
215 changed files with 3330 additions and 1634 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -2408,6 +2408,10 @@
      {
        "defaultMessage": "New toots:",
        "id": "notifications.column_settings.status"
+      },
+      {
+        "defaultMessage": "Edits:",
+        "id": "notifications.column_settings.update"
      }
    ],
    "path": "app/javascript/mastodon/features/notifications/components/column_settings.json"
@@ -2493,6 +2497,10 @@
        "defaultMessage": "{name} just posted",
        "id": "notification.status"
      },
+      {
+        "defaultMessage": "{name} edited a post",
+        "id": "notification.update"
+      },
      {
        "defaultMessage": "{name} has requested to follow you",
        "id": "notification.follow_request"