From e58fd0550b4a29fac9d52dc8a78d04333ccc8c06 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 17 Jun 2013 01:27:55 -0700 Subject: new ui - initial user changes --- users/config/locales/en.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'users/config/locales/en.yml') diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 32d183b..3c42b55 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -1,9 +1,14 @@ en: - none: "None." - signup: "Sign up" + email_settings: "Email Settings" + account_settings: "Account Settings" + logout: "Logout" + none: "None" + signup: "Sign Up" signup_message: "Please create an account." cancel: "Cancel" - login: "Login" + login: "Log In" + username: "Username" + password: "Password" login_message: "Please login with your account." invalid_user_pass: "Not a valid username/password combination" all_strategies_failed: "Could not understand your login attempt. Please first send your login and a SRP ephemeral value A and then send the client_auth in the same session (using cookies)." @@ -20,7 +25,7 @@ en: user_updated_successfully: "Settings have been updated successfully." user_created_successfully: "Successfully created your account." email_alias_destroyed_successfully: "Successfully removed the alias '%{alias}'." - use_ascii_key: "Use ASCII-armored PGP key" + use_ascii_key: "Use ASCII-armored OpenPGP key" can_retype_old_password: "Retype your old password if you would like to keep that" associated_email: "The associated email address is" cookie_disabled_warning: "You have cookies disabled. You will not be able to login until you enable cookies." @@ -28,7 +33,7 @@ en: activemodel: models: - user: + user: one: User other: "%{count} Users" simple_form: @@ -42,4 +47,4 @@ en: placeholders: user: email_forward: "my_other_email@domain.net" - + -- cgit v1.2.3