diff options
author | Reverite <github@reverite.sh> | 2019-09-30 16:38:09 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-09-30 16:38:09 -0700 |
commit | 01001ba118d7adcd4966c893cf95db32fe76c273 (patch) | |
tree | fc8b580c8f0a3c1e14a8ca20e3bea5bd7acb4ff1 /config/locales/simple_form.en.yml | |
parent | 1e75b3d874973dd71ea74b158ebeb501d9ac68a3 (diff) | |
parent | 65db9df011a3e13efa79f4e56343aa69bdad7716 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r-- | config/locales/simple_form.en.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 9a27d4c2a..810a3f2a7 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -2,6 +2,10 @@ en: simple_form: hints: + account_alias: + acct: Specify the username@domain of the account you want to move from + account_migration: + acct: Specify the username@domain of the account you want to move to account_warning_preset: text: You can use toot syntax, such as URLs, hashtags and mentions admin_account_action: @@ -15,6 +19,8 @@ en: avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px bot: This account mainly performs automated actions and might not be monitored context: One or multiple contexts where the filter should apply + current_password: For security purposes please enter the password of the current account + current_username: To confirm, please enter the username of the current account digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence discoverable: The profile directory is another way by which your account can reach a wider audience email: You will be sent a confirmation e-mail @@ -48,6 +54,8 @@ en: domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored featured_tag: name: 'You might want to use one of these:' + form_challenge: + current_password: You are entering a secure area imports: data: CSV file exported from another Mastodon server invite_request: @@ -63,6 +71,10 @@ en: fields: name: Label value: Content + account_alias: + acct: Handle of the old account + account_migration: + acct: Handle of the new account account_warning_preset: text: Preset text admin_account_action: |