diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /config/locales/en-GB.yml | |
parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'config/locales/en-GB.yml')
-rw-r--r-- | config/locales/en-GB.yml | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index fc7fc9edf..26540146f 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1,5 +1,34 @@ --- en-GB: + about: + about_mastodon_html: 'The social network of the future: No ads, no corporate surveillance, ethical design, and decentralisation! Own your data with Mastodon!' + contact_missing: Not set + contact_unavailable: N/A + hosted_on: Mastodon hosted on %{domain} + title: About + accounts: + follow: Follow + followers: + one: Follower + other: Followers + following: Following + 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 suspended. + last_active: last active + link_verified_on: Ownership of this link was checked on %{date} + nothing_here: There is nothing here! + pin_errors: + following: You must be already following the person you want to endorse + posts: + one: Post + other: Posts + posts_tab_heading: Posts + admin: + account_actions: + action: Perform action + title: Perform moderation action on %{acct} + account_moderation_notes: + create: Leave note + created_msg: Moderation note successfully created! errors: '400': The request you submitted was invalid or malformed. '403': You don't have permission to view this page. |