Merge remote-tracking branch 'glitch/main'

1 files changed, 51 insertions, 6 deletions

diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 265466695..6f3c5e1a0 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -652,15 +652,19 @@
         "id": "status.admin_account"
       },
       {
-        "defaultMessage": "Open this status in the moderation interface",
+        "defaultMessage": "Open this post in the moderation interface",
         "id": "status.admin_status"
       },
       {
-        "defaultMessage": "Copy link to status",
+        "defaultMessage": "Open moderation interface for {domain}",
+        "id": "status.admin_domain"
+      },
+      {
+        "defaultMessage": "Copy link to post",
         "id": "status.copy"
       },
       {
-        "defaultMessage": "Hide toot",
+        "defaultMessage": "Hide post",
         "id": "status.hide"
       },
       {
@@ -1044,6 +1048,23 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "{name} has requested to follow you",
+        "id": "account.requested_follow"
+      },
+      {
+        "defaultMessage": "Authorize",
+        "id": "follow_request.authorize"
+      },
+      {
+        "defaultMessage": "Reject",
+        "id": "follow_request.reject"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/account/components/follow_request_note.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "Unfollow",
         "id": "account.unfollow"
       },
@@ -1180,6 +1201,10 @@
         "id": "status.admin_account"
       },
       {
+        "defaultMessage": "Open moderation interface for {domain}",
+        "id": "status.admin_domain"
+      },
+      {
         "defaultMessage": "Change subscribed languages",
         "id": "account.languages"
       },
@@ -2014,6 +2039,22 @@
       {
         "defaultMessage": "Search results",
         "id": "explore.search_results"
+      },
+      {
+        "defaultMessage": "Posts",
+        "id": "explore.trending_statuses"
+      },
+      {
+        "defaultMessage": "Hashtags",
+        "id": "explore.trending_tags"
+      },
+      {
+        "defaultMessage": "News",
+        "id": "explore.trending_links"
+      },
+      {
+        "defaultMessage": "For you",
+        "id": "explore.suggested_follows"
       }
     ],
     "path": "app/javascript/mastodon/features/explore/index.json"
@@ -3564,6 +3605,10 @@
         "id": "status.admin_status"
       },
       {
+        "defaultMessage": "Open moderation interface for {domain}",
+        "id": "status.admin_domain"
+      },
+      {
         "defaultMessage": "Copy link to status",
         "id": "status.copy"
       },
@@ -3918,15 +3963,15 @@
         "id": "confirmations.discard_edit_media.confirm"
       },
       {
-        "defaultMessage": "Describe for people with hearing loss",
+        "defaultMessage": "Describe for people who are hard of hearing",
         "id": "upload_form.audio_description"
       },
       {
-        "defaultMessage": "Describe for people with hearing loss or visual impairment",
+        "defaultMessage": "Describe for people who are deaf, hard of hearing, blind or have low vision",
         "id": "upload_form.video_description"
       },
       {
-        "defaultMessage": "Describe for the visually impaired",
+        "defaultMessage": "Describe for people who are blind or have low vision",
         "id": "upload_form.description"
       },
       {