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

diff --combined config/locales/en.yml
index d24987aefb28deb07769794c1e8d3a4903716def,89686d4e3b8229cad819739fb08bd7d2f8481ffd..16bef0bd0919a0a803b4f19dc49b34032be835b2
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1001,14 -1001,6 +1001,14 @@@ en
            wayside_shrine: "Wayside Shrine"
            wreck: "Wreck"
            "yes": "Historic Site"
 +        information:
 +          guidepost: "Guidepost"
 +          board: "Information Board"
 +          map: "Map"
 +          office: "Tourist Office"
 +          terminal: "Information Terminal"
 +          sign: "Information Sign"
 +          stele: "Information Stele"
          junction:
            "yes": "Junction"
          landuse:
@@@ -1081,8 -1073,6 +1081,8 @@@
            track: "Running Track"
            water_park: "Water Park"
            "yes": "Leisure"
 +        lock:
 +          "yes": "Lock"
          man_made:
            adit: "Adit"
            advertising: "Advertising"
@@@ -1423,17 -1413,6 +1423,17 @@@
            building_passage: "Building Passage"
            culvert: "Culvert"
            "yes": "Tunnel"
 +        water:
 +          lake: "Lake"
 +          pond: "Pond"
 +          reservoir: "Reservoir"
 +          basin: "Water basin"
 +          fishpond: "Fish Pond"
 +          lagoon: "Lagoon"
 +          wastewater: "Waste Water"
 +          oxbow: "Oxbow"
 +          stream_pool: "Stream Pool"
 +          lock: "Lock"
          waterway:
            artificial: "Artificial Waterway"
            boatyard: "Boatyard"
@@@ -1831,16 -1810,6 +1831,16 @@@
        title: My Preferences
        preferred_editor: Preferred Editor
        preferred_languages: Preferred Languages
 +      preferred_site_color_scheme: Preferred Website Color Scheme
 +      site_color_schemes:
 +        auto: Auto
 +        light: Light
 +        dark: Dark
 +      preferred_map_color_scheme: Preferred Map Color Scheme
 +      map_color_schemes:
 +        auto: Auto
 +        light: Light
 +        dark: Dark
        edit_preferences: Edit Preferences
      edit:
        title: Edit Preferences
@@@ -2628,25 -2597,6 +2628,25 @@@
        wikipedia:
          title: Log in with Wikipedia
          alt: Wikipedia logo
 +    share:
 +      email:
 +        title: Share via Email
 +        alt: Email icon
 +      facebook:
 +        title: Share via Facebook
 +        alt: Facebook Icon
 +      linkedin:
 +        title: Share via LinkedIn
 +        alt: LinkedIn Icon
 +      mastodon:
 +        title: Share on Mastodon
 +        alt: Mastodon Icon
 +      telegram:
 +        title: Share on Telegram
 +        alt: Telegram Icon
 +      x:
 +        title: Share on X
 +        alt: X Icon
    oauth:
      permissions:
        missing: "You have not permitted the application access to this facility"
@@@ -2843,18 -2793,20 +2843,20 @@@
        report: Report this User
      go_public:
        flash success: "All your edits are now public, and you are now allowed to edit."
-     index:
-       title: Users
-       heading: Users
-       summary_html: "%{name} created from %{ip_address} on %{date}"
-       summary_no_ip_html: "%{name} created on %{date}"
-       empty: No matching users found
-     page:
-       found_users:
-         one: "%{count} user found"
-         other: "%{count} users found"
-       confirm: Confirm Selected Users
-       hide: Hide Selected Users
+     lists:
+       show:
+         title: Users
+         heading: Users
+         empty: No matching users found
+       page:
+         found_users:
+           one: "%{count} user found"
+           other: "%{count} users found"
+         confirm: Confirm Selected Users
+         hide: Hide Selected Users
+       user:
+         summary_html: "%{name} created from %{ip_address} on %{date}"
+         summary_no_ip_html: "%{name} created on %{date}"
      suspended:
        title: Account Suspended
        heading: Account Suspended
@@@ -2948,15 -2900,6 +2950,15 @@@
          years:
            one: "%{count} year"
            other: "%{count} years"
 +      short:
 +        ended: "ended"
 +        revoked_html: "revoked by %{name}"
 +        active: "active"
 +        active_unread: "active unread"
 +        expired_unread: "expired unread"
 +        read_html: "read at %{time}"
 +        time_in_future_title: "%{time_absolute}; in %{time_relative}"
 +        time_in_past_title: "%{time_absolute}; %{time_relative}"
      blocks_on:
        title: "Blocks on %{name}"
        heading_html: "List of Blocks on %{name}"
@@@ -2975,15 -2918,15 +2977,15 @@@
        reason: "Reason for block:"
        revoker: "Revoker:"
      block:
 -      not_revoked: "(not revoked)"
        show: "Show"
        edit: "Edit"
      page:
        display_name: "Blocked User"
        creator_name: "Creator"
        reason: "Reason for block"
 +      start: "Start"
 +      end: "End"
        status: "Status"
 -      revoker_name: "Revoked by"
      navigation:
        all_blocks: "All Blocks"
        blocks_on_me: "Blocks on Me"
@@@ -3072,9 -3015,6 +3074,9 @@@
        anonymous_warning_sign_up: "sign up"
        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
        add: Add Note
 +    new_readonly:
 +      title: "New Note"
 +      warning: "New notes cannot be created because the OpenStreetMap API is currently in read-only mode."
      notes_paging_nav:
        showing_page: "Page %{page}"
        next: "Next"

diff --combined config/routes.rb
index 4d3c1bf5575db08bf866ae8372aa3f6155dc5b18,31b42f99f38063c4df7a6767b15f8e09ab164320..89e6364091b88e2af02560be9fd7531615a7a99e
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -77,25 -77,25 +77,25 @@@ OpenStreetMap::Application.routes.draw 
          put "" => "user_preferences#update_all", :as => ""
        end
      end
 +  end
  
 -    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :destroy], :controller => "messages", :as => :api_messages do
 +  namespace :api, :path => "api/0.6" do
 +    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :update, :destroy] do
        collection do
          get "inbox"
          get "outbox"
        end
      end
 +    post "/user/messages/:id" => "messages#update"
  
 -    post "/user/messages/:id" => "messages#update", :as => :api_message_update
 -
 -    post "gpx/create" => "traces#create"
 -    get "gpx/:id" => "traces#show", :as => :api_trace, :id => /\d+/
 -    put "gpx/:id" => "traces#update", :id => /\d+/
 -    delete "gpx/:id" => "traces#destroy", :id => /\d+/
 -    get "gpx/:id/details" => "traces#show", :id => /\d+/
 -    get "gpx/:id/data" => "traces#data", :as => :api_trace_data
 -  end
 +    resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do
 +      scope :module => :traces do
 +        resource :data, :only => :show
 +      end
 +    end
 +    post "gpx/create" => "traces#create", :id => /\d+/, :as => :trace_create
 +    get "gpx/:id/details" => "traces#show", :id => /\d+/, :as => :trace_details
  
 -  namespace :api, :path => "api/0.6" do
      # Map notes API
      resources :notes, :except => [:new, :edit, :update], :id => /\d+/, :controller => "notes" do
        collection do
@@@ -288,8 -288,9 +288,9 @@@
    match "/user/:display_name/remove_friend" => "friendships#remove_friend", :via => [:get, :post], :as => "remove_friend"
  
    # user lists
-   match "/users" => "users#index", :via => [:get, :post]
-   match "/users/:status" => "users#index", :via => [:get, :post]
+   namespace :users do
+     resource :list, :path => "(:status)", :only => [:show, :update]
+   end
  
    # geocoder
    get "/search" => "geocoder#search"