diff options
author | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
commit | 020b40efdb2e4ddac14bea81ad60512d51eb7fe5 (patch) | |
tree | b9afe17c1257490af354f76d6e1c1f1b3788e546 /app/javascript/mastodon/locales/en.json | |
parent | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (diff) | |
parent | 235c14c79d620d47012a08425324df222a136457 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml
Diffstat (limited to 'app/javascript/mastodon/locales/en.json')
-rw-r--r-- | app/javascript/mastodon/locales/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 028f9aefd..e72c45bf2 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -13,7 +13,7 @@ "account.moved_to": "{name} has moved to:", "account.mute": "Mute @{name}", "account.mute_notifications": "Mute notifications from @{name}", - "account.posts": "Posts", + "account.posts": "Toots", "account.report": "Report @{name}", "account.requested": "Awaiting approval. Click to cancel follow request", "account.share": "Share @{name}'s profile", |