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

app/javascript/mastodon/locales/defaultMessages.json

@@ -308,6 +308,10 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Read more",
+        "id": "status.read_more"
+      },
       {
         "defaultMessage": "Show more",
         "id": "status.show_more"
@@ -397,6 +401,14 @@
         "defaultMessage": "Block",
         "id": "confirmations.block.confirm"
       },
+      {
+        "defaultMessage": "Reply",
+        "id": "confirmations.reply.confirm"
+      },
+      {
+        "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+        "id": "confirmations.reply.message"
+      },
       {
         "defaultMessage": "Are you sure you want to block {name}?",
         "id": "confirmations.block.message"
@@ -1767,6 +1779,14 @@
         "defaultMessage": "Detailed conversation view",
         "id": "status.detailed_status"
       },
+      {
+        "defaultMessage": "Reply",
+        "id": "confirmations.reply.confirm"
+      },
+      {
+        "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+        "id": "confirmations.reply.message"
+      },
       {
         "defaultMessage": "Are you sure you want to block {name}?",
         "id": "confirmations.block.message"
@@ -2130,6 +2150,10 @@
         "defaultMessage": "Sensitive content",
         "id": "status.sensitive_warning"
       },
+      {
+        "defaultMessage": "Media hidden",
+        "id": "status.media_hidden"
+      },
       {
         "defaultMessage": "Click to view",
         "id": "status.sensitive_toggle"
@@ -2137,4 +2161,4 @@
     ],
     "path": "app/javascript/mastodon/features/video/index.json"
   }
-]
+]