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/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -247,6 +247,7 @@
  "status.block": "Block @{name}",
  "status.cannot_reblog": "This post cannot be boosted",
  "status.delete": "Delete",
+  "status.direct": "Direct message @{name}",
  "status.embed": "Embed",
  "status.favourite": "Favourite",
  "status.load_more": "Load more",