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

diff --combined config/locales/en.yml
index c3a752e4ac4e35edcd551db4ace58a98a3b314f2,0d2da3a328a9e288088b4739d55e97cb041be506..b1752834be165044a47cc9d2f9c83e65d7cabc10
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -573,21 -573,6 +573,21 @@@ en
        applications:
          create:
            notice: Application Registered.
 +  errors:
 +    contact:
 +      contact_url: https://wiki.openstreetmap.org/wiki/Contact
 +      contact_url_title: Various contact channels explained
 +      contact: contact
 +      contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.
 +    forbidden:
 +      title: Forbidden
 +      description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
 +    internal_server_error:
 +      title: Application error
 +      description: The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)
 +    not_found:
 +      title: File not found
 +      description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)
    friendships:
      make_friend:
        heading: "Add %{user} as a friend?"
@@@ -605,11 -590,8 +605,8 @@@
      search:
        title:
          latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-         ca_postcode_html: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
          osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-         geonames_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
          osm_nominatim_reverse_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-         geonames_reverse_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
@@@ -2949,8 -2931,6 +2946,8 @@@
        descend: "Descend"
        directions: "Directions"
        distance: "Distance"
 +      distance_m: "%{distance}m"
 +      distance_km: "%{distance}km"
        errors:
          no_route: "Couldn't find a route between those two places."
          no_place: "Sorry - couldn't locate '%{place}'."