diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-10 22:33:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-10 22:33:41 +0200 |
| commit | 31e4fcb006c6ef2d8e1a4c765e897afa1cba1b5c (patch) | |
| tree | 15a022b1b44f72fee2d83cfe6f8355b7334f9d9b /config/locales/en_GB.yml | |
| parent | cb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff) | |
| parent | 2f422b708f75bea87a49eb879ec3e0c3f35c2f9b (diff) | |
Merge pull request #985 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en_GB.yml')
| -rw-r--r-- | config/locales/en_GB.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 9e6eb5e94..d428a95c3 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -506,7 +506,6 @@ en_GB: warning: Be very careful with this data. Never share it with anyone! your_token: Your access token auth: - agreement_html: By clicking "Sign up" below you agree to follow <a href="%{rules_path}">the rules of the server</a> and <a href="%{terms_path}">our terms of service</a>. apply_for_account: Request an invite change_password: Password checkbox_agreement_html: I agree to the <a href="%{rules_path}" target="_blank">server rules</a> and <a href="%{terms_path}" target="_blank">terms of service</a> @@ -855,9 +854,7 @@ en_GB: notifications: Notifications preferences: Preferences relationships: Follows and followers - settings: Settings two_factor_authentication: Two-factor Auth - your_apps: Your applications statuses: attached: description: 'Attached: %{attached}' |