Merge remote-tracking branch 'upstream/pull/5461'

diff --combined config/locales/en.yml
index 72632d1e8af9a7a55cbfb3d020c8b544464e8a00,ea11ab03d87d1eea57406c51ab548820cd0ad584..3fabe13c1ff39502935a9dbe39e7898bd40ded3d
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -245,25 -245,6 +245,6 @@@ en
        entry:
          comment: Comment
          full: Full note
-   account:
-     deletions:
-       show:
-         title: Delete My Account
-         warning: Warning! The account deletion process is final, and cannot be reversed.
-         delete_account: Delete Account
-         delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
-         delete_profile: Your profile information, including your avatar, description and home location will be removed.
-         delete_display_name: Your display name will be removed, and can be reused by other accounts.
-         retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
-         retain_edits: Your edits to the map database, if any, will be retained.
-         retain_traces: Your uploaded traces, if any, will be retained.
-         retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
-         retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
-         retain_changeset_discussions: Your changeset discussions, if any, will be retained.
-         retain_email: Your email address will be retained.
-         recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
-         confirm_delete: Are you sure?
-         cancel: Cancel
    accounts:
      edit:
        title: "Edit account"
@@@ -305,6 -286,24 +286,24 @@@
        success: "User information updated successfully."
      destroy:
        success: "Account Deleted."
+     deletions:
+       show:
+         title: Delete My Account
+         warning: Warning! The account deletion process is final, and cannot be reversed.
+         delete_account: Delete Account
+         delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
+         delete_profile: Your profile information, including your avatar, description and home location will be removed.
+         delete_display_name: Your display name will be removed, and can be reused by other accounts.
+         retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
+         retain_edits: Your edits to the map database, if any, will be retained.
+         retain_traces: Your uploaded traces, if any, will be retained.
+         retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
+         retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
+         retain_changeset_discussions: Your changeset discussions, if any, will be retained.
+         retain_email: Your email address will be retained.
+         recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
+         confirm_delete: Are you sure?
+         cancel: Cancel
    browse:
      deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
      edited_ago_by_html: "Edited %{time_ago} by %{user}"
@@@ -1752,6 -1751,8 +1751,6 @@@
        title: "No such message"
        heading: "No such message"
        body: "Sorry there is no message with that id."
 -    reply:
 -      wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
      show:
        title: "Read message"
        reply_button: "Reply"
@@@ -1811,9 -1812,6 +1810,9 @@@
          people_mapping_nearby: "people mapping nearby"
        message:
          destroy_button: "Delete"
 +    replies:
 +      new:
 +        wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
    passwords:
      new:
        title: "Lost password"
@@@ -2973,7 -2971,8 +2972,7 @@@
          ended: "ended"
          revoked_html: "revoked by %{name}"
          active: "active"
 -        active_unread: "active unread"
 -        expired_unread: "expired unread"
 +        active_until_read: "active until read"
          read_html: "read at %{time}"
          time_in_future_title: "%{time_absolute}; in %{time_relative}"
          time_in_past_title: "%{time_absolute}; %{time_relative}"

diff --combined config/routes.rb
index d213030c6729466bb2f0b48144ff60e284c25063,b068d997028d819b5bd55893042f0629f8d2a04c..6d6acc7db34654bfe024a1f1acb556476b8208f2
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -279,11 -279,10 +279,10 @@@ OpenStreetMap::Application.routes.draw 
    get "/user/:display_name/account", :to => redirect(:path => "/account/edit")
    post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user
  
-   resource :account, :only => [:edit, :update, :destroy]
- 
-   namespace :account do
-     resource :deletion, :only => [:show]
+   resource :account, :only => [:edit, :update, :destroy] do
+     resource :deletion, :module => :accounts, :only => :show
    end
+ 
    resource :dashboard, :only => [:show]
    resource :preferences, :only => [:show, :edit, :update]
    resource :profile, :only => [:edit, :update]
@@@ -315,7 -314,7 +314,7 @@@
      post :mark
      patch :unmute
  
 -    match :reply, :via => [:get, :post]
 +    resource :reply, :module => :messages, :path_names => { :new => "new" }, :only => :new
    end
    namespace :messages, :path => "/messages" do
      resource :inbox, :only => :show
@@@ -326,7 -325,6 +325,7 @@@
    get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
    get "/message/new/:display_name", :to => redirect(:path => "/messages/new/%{display_name}")
    get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
 +  get "/messages/:message_id/reply", :to => redirect(:path => "/messages/%{message_id}/reply/new")
  
    # muting users
    scope "/user/:display_name" do