diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
| commit | 5085559b15ef1c1fe3742757d00e5651fc52b5b5 (patch) | |
| tree | 0249b98caced1e39387564f04391eb1a0c39a2d7 /config/locales/simple_form.en.yml | |
| parent | cb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff) | |
| parent | 830c2a9ccbe98e145640e12637ef3da56f41a7b5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index ad9ae7417..ba0e403e4 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -41,6 +41,8 @@ en: name: 'You might want to use one of these:' imports: data: CSV file exported from another Mastodon server + invite_request: + text: This will help us review your application sessions: otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' user: @@ -120,12 +122,15 @@ en: must_be_follower: Block notifications from non-followers must_be_following: Block notifications from people you don't follow must_be_following_dm: Block direct messages from people you don't follow + invite_request: + text: Why do you want to join? notification_emails: digest: Send digest e-mails favourite: Send e-mail when someone favourites your status follow: Send e-mail when someone follows you follow_request: Send e-mail when someone requests to follow you mention: Send e-mail when someone mentions you + pending_account: Send e-mail when a new account needs review reblog: Send e-mail when someone boosts your status report: Send e-mail when a new report is submitted 'no': 'No' |