summaryrefslogtreecommitdiff
path: root/users/config/locales
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-06-17 01:27:55 -0700
committerelijah <elijah@riseup.net>2013-06-17 01:27:55 -0700
commita089c452a414e7d34d49f0e2703c632141361e2b (patch)
tree9e7a571d2e169dfdbe40871afba967e370437be7 /users/config/locales
parent742f01f1ca5f1006fba3c5c74489f920acca43b3 (diff)
new ui - initial user changes
Diffstat (limited to 'users/config/locales')
-rw-r--r--users/config/locales/en.yml17
1 files changed, 11 insertions, 6 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 2077858..5192e30 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)."
@@ -19,13 +24,13 @@ 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"
activemodel:
models:
- user:
+ user:
one: User
other: "%{count} Users"
simple_form:
@@ -39,4 +44,4 @@ en:
placeholders:
user:
email_forward: "my_other_email@domain.net"
-
+