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

diff --combined config/locales/en.yml
index 87ffcaac8626630a8f49c0019da162d1b8d61378,e19d26747a734706cf0025a80f852f058dedfe7f..3c1fca3611bc9fcd0db164b6842d495df8813656
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1194,7 -1194,6 +1194,7 @@@ en
        body: "Body"
        send_button: "Send"
        back_to_inbox: "Back to inbox"
 +    create:
        message_sent: "Message sent"
        limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
      no_such_message:
@@@ -1723,9 -1722,11 +1723,11 @@@
        visibility: "Visibility:"
        visibility_help: "what does this mean?"
        visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+     update:
+       updated: Trace updated
      trace_optionals:
        tags: "Tags"
-     view:
+     show:
        title: "Viewing trace %{name}"
        heading: "Viewing trace %{name}"
        pending: "PENDING"
@@@ -1740,8 -1741,8 +1742,8 @@@
        description: "Description:"
        tags: "Tags:"
        none: "None"
-       edit_track: "Edit this trace"
-       delete_track: "Delete this trace"
+       edit_trace: "Edit this trace"
+       delete_trace: "Delete this trace"
        trace_not_found: "Trace not found!"
        visibility: "Visibility:"
        confirm_delete: "Delete this trace?"
@@@ -1765,7 -1766,7 +1767,7 @@@
        by: "by"
        in: "in"
        map: "map"
-     list:
+     index:
        public_traces: "Public GPS traces"
        my_traces: "My GPS traces"
        public_traces_from: "Public GPS traces from %{user}"

diff --combined config/routes.rb
index a8c216bf5e961e23199dc20f4244bb80d8807523,e277aba86e90ab07e1a4d0228f55a682cb9d8cb3..286a53274d49193271d6a4fa81f5ce1c4be42629
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -189,30 -189,30 +189,30 @@@ OpenStreetMap::Application.routes.draw 
    post "/preview/:type" => "site#preview", :as => :preview
  
    # traces
-   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"
+   resources :traces, :except => [:show]
+   get "/user/:display_name/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/
+   get "/user/:display_name/traces/tag/:tag" => "traces#index"
+   get "/user/:display_name/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/
+   get "/user/:display_name/traces" => "traces#index"
    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" => "traces#show"
    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/page/:page" => "traces#index", :page => /[1-9][0-9]*/
+   get "/traces/tag/:tag" => "traces#index"
+   get "/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/
    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"
-   resources :traces, :only => [:new, :create]
    post "/trace/create" => "traces#create" # remove after deployment
    get "/trace/create", :to => redirect(:path => "/traces/new")
    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/edit" => "traces#update" # remove after deployment
+   get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")
    post "/trace/:id/delete" => "traces#delete", :id => /\d+/
  
    # diary pages
@@@ -264,7 -264,7 +264,7 @@@
    get "/export/embed" => "export#embed"
  
    # messages
 -  resources :messages, :only => [:show] do
 +  resources :messages, :only => [:create, :show] do
      collection do
        get :inbox
        get :outbox
@@@ -272,7 -272,7 +272,7 @@@
    end
    get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox")
    get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
 -  match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"
 +  get "/message/new/:display_name" => "messages#new", :as => "new_message"
    get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
    post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
    match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"