summaryrefslogtreecommitdiff
path: root/users/config/locales
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-02-26 10:45:52 -0800
committerjessib <jessib@riseup.net>2013-02-26 10:45:52 -0800
commit994f8d23a5a961b8656136eae2aec56204293c52 (patch)
tree09a6cbcd6c4fad8fcf130d6c2d268afe025886ca /users/config/locales
parent5dbbf733a6abe809a38667e8b3277fd06db24788 (diff)
parent73e9332dadde9f37a85753faf40b9b6b2d73dd88 (diff)
Merge pull request #28 from leapcode/feature/change_login
Feature/change login
Diffstat (limited to 'users/config/locales')
-rw-r--r--users/config/locales/en.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 493b5db..bda38fe 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -8,8 +8,11 @@ en:
wrong_password: "wrong password"
user_not_found: "could not be found"
change_login: "Change Login"
+ change_login_and_password: "Change Login and Password"
change_password: "Change Password"
cancel_account: "Cancel your account"
+ remove_account: "Remove Account"
+ admin_cancel_account: "Cancel the account %{username}"
set_email_address: "Set email address"
forward_email: "Forward email"
email_aliases: "Email aliases"
@@ -19,6 +22,8 @@ en:
user_created_successfully: "Successfully created your account."
email_alias_destroyed_successfully: "Successfully removed the alias '%{alias}'."
use_ascii_key: "Use ASCII-armored PGP key"
+ can_retype_old_password: "Retype your old password if you would like to keep that"
+ associated_email: "The associated email address is"
activemodel:
models: