diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-09 17:43:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-10 00:03:28 +0200 |
| commit | 1c9c0167b7ea7dd03ef233a085adc0a6ef1b2527 (patch) | |
| tree | ccfcb53c4ddb61d7ef3158d29403ff7cd6516e55 /config/locales/simple_form.en.yml | |
| parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
| parent | ac788ad47e32a3cf84a46ac87f84f376185cdad4 (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index f635bf441..16ecc7c9e 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -4,6 +4,7 @@ en: hints: defaults: avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px + bot: Warns people that the account does not represent a person digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence display_name: one: <span class="name-counter">1</span> character left @@ -19,7 +20,7 @@ en: imports: data: CSV file exported from another Mastodon instance sessions: - otp: Enter the Two-factor code from your phone or use one of your recovery codes. + otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' user: filtered_languages: Checked languages will be filtered from public timelines for you labels: @@ -29,6 +30,7 @@ en: value: Content defaults: avatar: Avatar + bot: This is a bot account confirm_new_password: Confirm new password confirm_password: Confirm password current_password: Current password |