diff options
| author | Azul <azul@leap.se> | 2012-12-13 17:17:30 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-13 17:17:30 +0100 |
| commit | a77d5cf5fd2ff6cc335b586477d6d6e58f758591 (patch) | |
| tree | 32640ef2457ecce3a08f704f5b5b0ac00a37f9d8 /users/config/locales | |
| parent | 961fe13b784e7f44e55f9cd0a106728c69354a0f (diff) | |
| parent | 32db6e2ee3ae449f2fe0f947f9ac4aafde340a9d (diff) | |
Merge branch 'master' into develop
Conflicts:
users/test/unit/user_test.rb
Diffstat (limited to 'users/config/locales')
| -rw-r--r-- | users/config/locales/en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index fe7e824..d068e70 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -12,6 +12,7 @@ en: set_email_address: "Set email address" forward_email: "Forward email" email_aliases: "Email aliases" + add_email_alias: "Add email alias" user_updated_successfully: "Settings have been updated successfully." user_created_successfully: "Successfully created your account." |