summaryrefslogtreecommitdiff
path: root/users/config/locales
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-02-26 13:25:25 -0800
committerjessib <jessib@leap.se>2013-02-26 13:25:25 -0800
commitc97f356ae8ce07dab04b81d0d0160f3e5fd96f6d (patch)
tree73e5d68347d5aa839b3b63eaf3eefcc49e4d937d /users/config/locales
parenta7722e57ee6e10b578457e880f04349f7f9a0f66 (diff)
parent97fe2b4d19edacf2ea67c7efcfbec50feca305b0 (diff)
Merge branch 'master' into feature/limit_usernames
Diffstat (limited to 'users/config/locales')
-rw-r--r--users/config/locales/en.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index bda38fe..1b2789e 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -7,9 +7,7 @@ en:
login_message: "Please login with your account."
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"
+ update_login_and_password: "Update Login and Password"
cancel_account: "Cancel your account"
remove_account: "Remove Account"
admin_cancel_account: "Cancel the account %{username}"