diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-15 16:56:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 16:56:33 +0200 |
| commit | 37c092e9fdedd36c167e4b84610e7346c446e1d3 (patch) | |
| tree | 88992f2d65c83ece4e93f0b4b5c34ffed0989138 /config/locales/en.yml | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | 470458da13586db0e6ca074987fecfc80293d955 (diff) | |
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 23bed812e..2cae0a3e3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -21,7 +21,9 @@ en: federation_hint_html: With an account on %{instance} you'll be able to follow people on any Mastodon server and beyond. get_apps: Try a mobile app hosted_on: Mastodon hosted on %{domain} - instance_actor_flash: This account is a virtual actor used to represent the server itself and not any individual user. It is used for federation purposes and should not be blocked unless you want to block the whole instance, in which case you should use a domain block. + instance_actor_flash: | + This account is a virtual actor used to represent the server itself and not any individual user. + It is used for federation purposes and should not be blocked unless you want to block the whole instance, in which case you should use a domain block. learn_more: Learn more privacy_policy: Privacy policy see_whats_happening: See what's happening |