diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-18 11:52:04 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-18 11:52:04 -0500 |
commit | 42e8c8eb0e9964d157ac160b3f816e58a771f045 (patch) | |
tree | c3f044eacc21ff65d9cb1bf20d111aaff6c86074 /config/locales/en.yml | |
parent | 4421f6598f5883908fb25743977306f19a0b0f0f (diff) | |
parent | 09d81defcda96eae7ffba36ccf1fb091ce08f17b (diff) |
Merge tag 'v2.0.0' into gs-master
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 7d2596fc6..45929e97d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,8 +1,8 @@ --- en: about: - 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_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 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 @@ -50,6 +50,13 @@ en: admin: Admin unfollow: Unfollow admin: + account_moderation_notes: + account: Moderator + create: Create + created_at: Date + created_msg: Moderation note successfully created! + delete: Delete + destroyed_msg: Moderation note successfully destroyed! accounts: are_you_sure: Are you sure? confirm: Confirm @@ -110,15 +117,6 @@ en: unsubscribe: Unsubscribe username: Username web: Web - - account_moderation_notes: - account: Moderator - created_at: Date - create: Create - created_msg: Moderation note successfully created! - delete: Delete - destroyed_msg: Moderation note successfully destroyed! - custom_emojis: copied_msg: Successfully created local copy of the emoji copy: Copy |