diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-27 11:29:04 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-27 11:29:04 -0600 |
| commit | e77c3996a513a45e5cad368b0053459f303c60cb (patch) | |
| tree | 923411336e4207bb95c17c90c79f19dabb4d62e2 /config/locales/simple_form.en.yml | |
| parent | 5de42665d77431def632ca8fb8665082027c60a5 (diff) | |
| parent | 1c5b0e333464d8da3de73e4886502c816cb8173e (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index faf41f316..ff1a40ccd 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -30,10 +30,12 @@ en: data: Data display_name: Display name email: E-mail address + expires_in: Expire after filtered_languages: Filtered languages header: Header locale: Language locked: Lock account + max_uses: Max number of uses new_password: New password note: Bio otp_attempt: Two-factor code |