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 | |
| parent | 5de42665d77431def632ca8fb8665082027c60a5 (diff) | |
| parent | 1c5b0e333464d8da3de73e4886502c816cb8173e (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 24 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 627f2a918..198bd0411 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -231,6 +231,8 @@ en: reset: Reset search: Search title: Known instances + invites: + title: Invites reports: action_taken_by: Action taken by are_you_sure: Are you sure? @@ -269,6 +271,9 @@ en: deletion: desc_html: Allow anyone to delete their account title: Open account deletion + min_invite_role: + disabled: No one + title: Allow invitations by open: desc_html: Allow anyone to create an account title: Open registration @@ -432,6 +437,25 @@ en: match_whole_word: Match whole word remove: Remove remove_all: Remove all + invites: + delete: Delete + expires_in: + '1800': 30 minutes + '21600': 6 hours + '3600': 1 hour + '43200': 12 hours + '86400': 1 day + expires_in_prompt: Never + generate: Generate + max_uses: + one: 1 use + other: "%{count} uses" + max_uses_prompt: No limit + prompt: Generate and share links with others to grant access to this instance + table: + expires_at: Expires + uses: Uses + title: Invite people landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse." landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>. media_attachments: 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 |