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.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.yml')
| -rw-r--r-- | config/locales/en.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index bf06dc9ad..a2cd84fc5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -134,6 +134,7 @@ en: moderation_notes: Moderation notes most_recent_activity: Most recent activity most_recent_ip: Most recent IP + no_account_selected: No accounts were changed as none were selected no_limits_imposed: No limits imposed not_subscribed: Not subscribed outbox_url: Outbox URL @@ -515,7 +516,6 @@ en: 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> @@ -864,6 +864,9 @@ en: revoke_success: Session successfully revoked title: Sessions settings: + account: Account + account_settings: Account settings + appearance: Appearance authorized_apps: Authorized apps back: Back to Mastodon delete: Account deletion @@ -874,13 +877,13 @@ en: flavours: Flavours identity_proofs: Identity proofs import: Import + import_and_export: Import and export migrate: Account migration notifications: Notifications preferences: Preferences + profile: Profile relationships: Follows and followers - settings: Settings two_factor_authentication: Two-factor Auth - your_apps: Your applications statuses: attached: description: 'Attached: %{attached}' |