diff options
| author | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
| commit | e1a004e2b24c2c235452469abfefa033e24435b2 (patch) | |
| tree | a4b1c89a5aa4d5ccb3c17521499c999dedd5842d /users/config | |
| parent | 4793c2b770fcb018303b7ab226b75cc218364327 (diff) | |
| parent | 8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (diff) | |
Merge branch 'master' into help_develop
Conflicts:
app/views/layouts/application.html.haml
help/app/controllers/tickets_controller.rb
help/test/functional/tickets_controller_test.rb
users/test/support/stub_record_helper.rb
Diffstat (limited to 'users/config')
| -rw-r--r-- | users/config/locales/en.yml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 1260494..fe7e824 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -6,9 +6,29 @@ en: login_message: "Please login with your account." wrong_password: "wrong password" user_not_found: "could not be found" + change_login: "Change Login" + change_password: "Change Password" + cancel_account: "Cancel your account" + set_email_address: "Set email address" + forward_email: "Forward email" + email_aliases: "Email aliases" + user_updated_successfully: "Settings have been updated successfully." + user_created_successfully: "Successfully created your account." activemodel: models: user: one: User other: "%{count} Users" + simple_form: + labels: + user: + email_forward: "Email forward" + hints: + user: + email_forward: "Forward all emails to this address" + email: "Your leap web email address" + placeholders: + user: + email_forward: "my_other_email@domain.net" + |