diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-10-18 17:57:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 17:57:42 -0400 |
| commit | c75665127878f41af2547b12b8723963c04d305b (patch) | |
| tree | d8275432c259d0fcd1385c163d7f2472b4a8684c /config/locales/en.yml | |
| parent | 4421f6598f5883908fb25743977306f19a0b0f0f (diff) | |
| parent | eb907a5babed83a73788b16772fb2cba6db8c2b4 (diff) | |
Merge pull request #188 from glitch-soc/merge-upstream-2-0-0
Merge with upstream v2.0.0
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 |