diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
| commit | a057ed5cfea2c1c4fb21984cadae993740fb25e0 (patch) | |
| tree | c965f135b8c46f679eb22e80a37550c8b985b9ea /config/locales/en.yml | |
| parent | 04eaa1943f002865f8a0234e19c6ea4cc1d3bb6a (diff) | |
| parent | 14c4a33cd9bfc1212cb362897272e5ea7d1529e5 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 804f9b199..12284403c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -343,7 +343,7 @@ en: warning: Be very careful with this data. Never share it with anyone! your_token: Your access token auth: - agreement_html: By signing up you agree to <a href="%{rules_path}">our terms of service</a> and <a href="%{terms_path}">privacy policy</a>. + agreement_html: By signing up you agree to follow <a href="%{rules_path}">the rules of the instance</a> and <a href="%{terms_path}">our terms of service</a>. change_password: Security delete_account: Delete account delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation. @@ -467,6 +467,9 @@ en: remove_all: Remove all landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse." landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>. + lists: + errors: + limit: You have reached the maximum amount of lists media_attachments: validations: images_and_video: Cannot attach a video to a status that already contains images @@ -602,11 +605,12 @@ en: open_in_web: Open in web over_character_limit: character limit of %{max} exceeded pin_errors: - limit: Too many toots pinned + limit: You have already pinned the maximum number of toots ownership: Someone else's toot cannot be pinned private: Non-public toot cannot be pinned reblog: A boost cannot be pinned show_more: Show more + title: '%{name}: "%{quote}"' visibilities: private: Followers-only private_long: Only show to followers |