diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-28 11:45:13 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-28 11:45:13 -0600 |
| commit | 95c270f5b1ffd328345a7b1223f65876f3d88423 (patch) | |
| tree | 621e27e89b238d8806fdd3294009361d0691f49c /config/locales/en.yml | |
| parent | 7463d80ff442833a4ad299460f37c27be9b8cda1 (diff) | |
| parent | 15fab79cfa5b732e9d7816f162272d72cf06c733 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index e0ae9eef9..dce2ed079 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -432,7 +432,8 @@ en: upload: Upload in_memoriam_html: In Memoriam. invites: - delete: Delete + delete: Deactivate + expired: Expired expires_in: '1800': 30 minutes '21600': 6 hours @@ -468,6 +469,7 @@ en: acct: username@domain of the new account currently_redirecting: 'Your profile is set to redirect to:' proceed: Save + updated_msg: Your account migration setting successfully updated! moderation: title: Moderation notification_mailer: |