diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-28 03:56:10 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-28 03:56:10 +0100 |
| commit | f4bc9620a9701db17cb8f651643f65c984e65c27 (patch) | |
| tree | 373ecda59f2135b45ba1fda41dcc9ab06560886a /config/locales | |
| parent | 04bce0cdf28402c3433403f399ee10113f6f5fdf (diff) | |
Update settings to re-use admin layout, one big navigation tree, improve settings forms
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 4 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 4f02a87e2..941fe5b3f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -31,10 +31,11 @@ en: applications: invalid_url: The provided URL is invalid auth: - change_password: Change password + change_password: Credentials didnt_get_confirmation: Didn't receive confirmation instructions? forgot_password: Forgot your password? login: Log in + logout: Logout register: Sign up resend_confirmation: Resend confirmation instructions reset_password: Reset password @@ -93,6 +94,7 @@ en: back: Back to Mastodon edit_profile: Edit profile preferences: Preferences + settings: Settings two_factor_auth: Two-factor Authentication statuses: over_character_limit: character limit of %{max} exceeded diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index e45a9a7a6..5ef4a18fa 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -3,7 +3,11 @@ en: simple_form: hints: defaults: + avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px + display_name: At most 30 characters + header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px locked: Requires you to manually approve followers and defaults post privacy to followers-only + note: At most 160 characters labels: defaults: avatar: Avatar |