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

diff --combined config/locales/en.yml
index 06f8bc9281ecf1315bf142bb0fc0d438a2272beb,dd2c6b3b5c3b5022d6d3bfd9ac61ab1b6064a65d..51f8dbecd04ba2b7b0e69be7e1eba25fffb1ee8c
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1057,7 -1057,7 +1057,7 @@@ en
          partial_changeset_without_comment: "without comment"
        details: "More details about the changeset can be found at %{url}."
        unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
-   message:
+   messages:
      inbox:
        title: "Inbox"
        my_inbox: "My Inbox"
@@@ -1569,7 -1569,7 +1569,7 @@@
            Just go to <a href='%{map_url}'>the map</a> and click the note icon:
            <span class='icon note'></span>. This will add a marker to the map, which you can move
            by dragging. Add your message, then click save, and other mappers will investigate.
 -  trace:
 +  traces:
      visibility:
        private: "Private (only shared as anonymous, unordered points)"
        public: "Public (shown in trace list and as anonymous, unordered points)"
@@@ -1578,19 -1578,6 +1578,19 @@@
      create:
        upload_trace: "Upload GPS Trace"
        trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
 +      traces_waiting:
 +        one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
 +        other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
 +      upload_gpx: "Upload GPX File:"
 +      description: "Description:"
 +      tags: "Tags:"
 +      tags_help: "comma delimited"
 +      visibility: "Visibility:"
 +      visibility_help: "what does this mean?"
 +      visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 +      upload_button: "Upload"
 +      help: "Help"
 +      help_url: "https://wiki.openstreetmap.org/wiki/Upload"
      edit:
        title: "Editing trace %{name}"
        heading: "Editing trace %{name}"
@@@ -1609,6 -1596,24 +1609,6 @@@
        visibility: "Visibility:"
        visibility_help: "what does this mean?"
        visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 -    trace_form:
 -      upload_gpx: "Upload GPX File:"
 -      description: "Description:"
 -      tags: "Tags:"
 -      tags_help: "comma delimited"
 -      visibility: "Visibility:"
 -      visibility_help: "what does this mean?"
 -      visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 -      upload_button: "Upload"
 -      help: "Help"
 -      help_url: "https://wiki.openstreetmap.org/wiki/Upload"
 -    trace_header:
 -      upload_trace: "Upload a trace"
 -      see_all_traces: "See all traces"
 -      see_my_traces: "See my traces"
 -      traces_waiting:
 -        one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
 -        other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
      trace_optionals:
        tags: "Tags"
      view:
@@@ -1658,9 -1663,6 +1658,9 @@@
        description: "Browse recent GPS trace uploads"
        tagged_with: " tagged with %{tags}"
        empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
 +      upload_trace: "Upload a trace"
 +      see_all_traces: "See all traces"
 +      see_my_traces: "See my traces"
      delete:
        scheduled_for_deletion: "Trace scheduled for deletion"
      make_public:

diff --combined config/routes.rb
index 2d47210fb1aa594e361e69cbd7b1f3867292c5c5,15d6c216cd36b37e219b8b1d7a15bf6b1ac32710..ed5e6876be3138b45c74b8640e9f6f05ed9befb5
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -74,12 -74,12 +74,12 @@@ OpenStreetMap::Application.routes.draw 
      put "user/preferences/:preference_key" => "user_preferences#update_one"
      delete "user/preferences/:preference_key" => "user_preferences#delete_one"
  
 -    post "gpx/create" => "trace#api_create"
 -    get "gpx/:id" => "trace#api_read", :id => /\d+/
 -    put "gpx/:id" => "trace#api_update", :id => /\d+/
 -    delete "gpx/:id" => "trace#api_delete", :id => /\d+/
 -    get "gpx/:id/details" => "trace#api_read", :id => /\d+/
 -    get "gpx/:id/data" => "trace#api_data"
 +    post "gpx/create" => "traces#api_create"
 +    get "gpx/:id" => "traces#api_read", :id => /\d+/
 +    put "gpx/:id" => "traces#api_update", :id => /\d+/
 +    delete "gpx/:id" => "traces#api_delete", :id => /\d+/
 +    get "gpx/:id/details" => "traces#api_read", :id => /\d+/
 +    get "gpx/:id/data" => "traces#api_data"
  
      # AMF (ActionScript) API
      post "amf/read" => "amf#amf_read"
@@@ -188,29 -188,29 +188,29 @@@
    post "/preview/:type" => "site#preview", :as => :preview
  
    # traces
 -  get "/user/:display_name/traces/tag/:tag/page/:page" => "trace#list", :page => /[1-9][0-9]*/
 -  get "/user/:display_name/traces/tag/:tag" => "trace#list"
 -  get "/user/:display_name/traces/page/:page" => "trace#list", :page => /[1-9][0-9]*/
 -  get "/user/:display_name/traces" => "trace#list"
 -  get "/user/:display_name/traces/tag/:tag/rss" => "trace#georss", :defaults => { :format => :rss }
 -  get "/user/:display_name/traces/rss" => "trace#georss", :defaults => { :format => :rss }
 -  get "/user/:display_name/traces/:id" => "trace#view"
 -  get "/user/:display_name/traces/:id/picture" => "trace#picture"
 -  get "/user/:display_name/traces/:id/icon" => "trace#icon"
 -  get "/traces/tag/:tag/page/:page" => "trace#list", :page => /[1-9][0-9]*/
 -  get "/traces/tag/:tag" => "trace#list"
 -  get "/traces/page/:page" => "trace#list", :page => /[1-9][0-9]*/
 -  get "/traces" => "trace#list"
 -  get "/traces/tag/:tag/rss" => "trace#georss", :defaults => { :format => :rss }
 -  get "/traces/rss" => "trace#georss", :defaults => { :format => :rss }
 -  get "/traces/mine/tag/:tag/page/:page" => "trace#mine", :page => /[1-9][0-9]*/
 -  get "/traces/mine/tag/:tag" => "trace#mine"
 -  get "/traces/mine/page/:page" => "trace#mine"
 -  get "/traces/mine" => "trace#mine"
 -  match "/trace/create" => "trace#create", :via => [:get, :post]
 -  get "/trace/:id/data" => "trace#data", :id => /\d+/, :as => "trace_data"
 -  match "/trace/:id/edit" => "trace#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"
 -  post "/trace/:id/delete" => "trace#delete", :id => /\d+/
 +  get "/user/:display_name/traces/tag/:tag/page/:page" => "traces#list", :page => /[1-9][0-9]*/
 +  get "/user/:display_name/traces/tag/:tag" => "traces#list"
 +  get "/user/:display_name/traces/page/:page" => "traces#list", :page => /[1-9][0-9]*/
 +  get "/user/:display_name/traces" => "traces#list"
 +  get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
 +  get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss }
 +  get "/user/:display_name/traces/:id" => "traces#view"
 +  get "/user/:display_name/traces/:id/picture" => "traces#picture"
 +  get "/user/:display_name/traces/:id/icon" => "traces#icon"
 +  get "/traces/tag/:tag/page/:page" => "traces#list", :page => /[1-9][0-9]*/
 +  get "/traces/tag/:tag" => "traces#list"
 +  get "/traces/page/:page" => "traces#list", :page => /[1-9][0-9]*/
 +  get "/traces" => "traces#list"
 +  get "/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
 +  get "/traces/rss" => "traces#georss", :defaults => { :format => :rss }
 +  get "/traces/mine/tag/:tag/page/:page" => "traces#mine", :page => /[1-9][0-9]*/
 +  get "/traces/mine/tag/:tag" => "traces#mine"
 +  get "/traces/mine/page/:page" => "traces#mine"
 +  get "/traces/mine" => "traces#mine"
 +  match "/trace/create" => "traces#create", :via => [:get, :post]
 +  get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
 +  match "/trace/:id/edit" => "traces#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"
 +  post "/trace/:id/delete" => "traces#delete", :id => /\d+/
  
    # diary pages
    match "/diary/new" => "diary_entry#new", :via => [:get, :post]
@@@ -261,13 -261,13 +261,13 @@@
    get "/export/embed" => "export#embed"
  
    # messages
-   get "/user/:display_name/inbox" => "message#inbox", :as => "inbox"
-   get "/user/:display_name/outbox" => "message#outbox", :as => "outbox"
-   match "/message/new/:display_name" => "message#new", :via => [:get, :post], :as => "new_message"
-   get "/message/read/:message_id" => "message#read", :as => "read_message"
-   post "/message/mark/:message_id" => "message#mark", :as => "mark_message"
-   match "/message/reply/:message_id" => "message#reply", :via => [:get, :post], :as => "reply_message"
-   post "/message/delete/:message_id" => "message#delete", :as => "delete_message"
+   get "/user/:display_name/inbox" => "messages#inbox", :as => "inbox"
+   get "/user/:display_name/outbox" => "messages#outbox", :as => "outbox"
+   match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"
+   get "/message/read/:message_id" => "messages#read", :as => "read_message"
+   post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
+   match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
+   post "/message/delete/:message_id" => "messages#delete", :as => "delete_message"
  
    # oauth admin pages (i.e: for setting up new clients, etc...)
    scope "/user/:display_name" do