diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-04 13:56:58 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-04 13:56:58 -0500 |
commit | 3ab6a8b8bed37d048909b178693af8411325eb38 (patch) | |
tree | db371121cbfb240d1338e803dff136f3023c2b87 /config/locales/en.yml | |
parent | bda1782cd864ed3aabb5a4d87359a1cb7595f4a6 (diff) | |
parent | 1c1042556d21e4c2eb22b7c5cbc11aa88087ca60 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: spec/views/about/show.html.haml_spec.rb
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index a1ed71afe..9e24fd8a1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,6 +4,7 @@ en: about_hashtag_html: These are public toots tagged with <strong>#%{hashtag}</strong>. You can interact with them if you have an account anywhere in the fediverse. about_mastodon_html: Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail. about_this: About + administered_by: 'Administered by:' closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there. contact: Contact contact_missing: Not set |