Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-11 00:50:09 +00:00
parent 67e77f230e d9b62e34da
commit 33c2bbdda7
40 changed files with 488 additions and 110 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -197,6 +197,10 @@
        "defaultMessage": "Delete",
        "id": "status.delete"
      },
+      {
+        "defaultMessage": "Direct message @{name}",
+        "id": "status.direct"
+      },
      {
        "defaultMessage": "Mention @{name}",
        "id": "status.mention"
@@ -1370,6 +1374,10 @@
        "defaultMessage": "Delete",
        "id": "status.delete"
      },
+      {
+        "defaultMessage": "Direct message @{name}",
+        "id": "status.direct"
+      },
      {
        "defaultMessage": "Mention @{name}",
        "id": "status.mention"