2 files changed, 18 insertions, 17 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 5192e30..63ac692 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -9,25 +9,26 @@ en:
   login: "Log In"
   username: "Username"
   password: "Password"
-  login_message: "Please login with your account."
+  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 OpenPGP key"
-  can_retype_old_password: "Retype your old password if you would like to keep that"
-  associated_email: "The associated email address is"
-
+  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."
   activemodel:
     models:
       user:
@@ -36,11 +37,12 @@ en:
   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 d07cda9..9eff2a1 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]
   end
 
   get "login" => "sessions#new", :as => "login"
@@ -16,7 +16,6 @@ Rails.application.routes.draw do
   resources :users do
     resource :overview, :only => [:show]
     resource :email_settings, :only => [:edit, :update]
-    resource :account_settings, :only => [:edit, :update]
     resources :email_aliases, :only => [:destroy], :id => /.*/
   end