2 files changed, 44 insertions, 23 deletions

diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index dded88c..b880887 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -1,44 +1,63 @@
 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_message: "Please login with your account."
+  login: "Log In"
+  username: "Username"
+  password: "Password"
+  change_password: "Change Password"
+  login_message: "Please log in 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)."
   update_login_and_password: "Update Login and Password"
-  cancel_account: "Cancel your account"
-  remove_account: "Remove Account"
-  admin_cancel_account: "Cancel the account %{username}"
+  destroy_my_account: "Destroy my account"
+  destroy_account_info: "This will permanently destroy your account and all the data associated with it. Proceed with caution!"
+  admin_destroy_account: "Destroy the account %{username}"
   set_email_address: "Set email address"
-  forward_email: "Forward email"
-  email_aliases: "Email aliases"
+  forward_email: "Forward Email"
+  email_aliases: "Email Aliases"
   public_key: "Public Key"
-  add_email_alias: "Add email alias"
+  add_email_alias: "Add Email Alias"
   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"
-  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."
-  js_required: "We are sorry, but this doesn't work without javascript enabled. This is for security reasons."
+  email_alias_destroyed_successfully: "Removed email alias %{alias}."
+  use_ascii_key: "OpenPGP public key. Do not change this value unless you know what you are doing."
+  advanced_options: "Advanced Options"
+  not_authorized: "Sorry, but you are not authorized to perform that action."
+  not_authorized_login: "Please log in to perform that action."
+  search: "Search"
 
+  #
+  # overview
+  #
+  overview_welcome: "Welcome %{username}."
+  overview_intro: "From this user control panel, you can:"
+  overview_tickets: "Create and check support tickets."
+  overview_email: "Modify email settings."
+  overview_account: "Change your password or delete your account."
+
+  #
+  # rails
+  #
   activemodel:
     models:
-      user: 
+      user:
         one: User
         other: "%{count} Users"
   simple_form:
     labels:
       user:
-        email_forward: "Email forward"
+        email_forward: "Email Forward"
     hints:
       user:
-        email_forward: "Forward all emails to this address"
-        email: "Your leap web email address"
+        email_forward: >
+          Forward all email messages to this address. Messages will be encrypted before being forwarded.
+          This is an option for advanced users who are familar with OpenPGP.
     placeholders:
       user:
         email_forward: "my_other_email@domain.net"
-        
+
diff --git a/users/config/routes.rb b/users/config/routes.rb
index 9a9a40e..b6d583e 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -5,7 +5,7 @@ Rails.application.routes.draw do
       defaults: {format: 'json'} } do
     resources :sessions, :only => [:new, :create, :update]
     delete "logout" => "sessions#destroy", :as => "logout"
-    resources :users, :only => [:create, :update]
+    resources :users, :only => [:create, :update, :destroy, :index]
   end
 
   get "login" => "sessions#new", :as => "login"
@@ -13,7 +13,9 @@ Rails.application.routes.draw do
   resources :sessions, :only => [:new, :create, :update]
 
   get "signup" => "users#new", :as => "signup"
-  resources :users do
+  resources :users, :except => [:create, :update] do
+    resource :overview, :only => [:show]
+    resource :email_settings, :only => [:edit, :update]
     resources :email_aliases, :only => [:destroy], :id => /.*/
   end