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

diff --combined config/locales/en.yml
index 0deb199a38d034a4f8828891046ab418fa841674,3a82aab3909b280ce105f7bf34ec78862d6d4500..b56fb6410c6af3c6460180e2d7921518d247ce7c
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2382,6 -2382,14 +2382,14 @@@ en
        where_am_i_title: Describe the current location using the search engine
        submit_text: "Go"
        reverse_directions_text: "Reverse Directions"
+       modes:
+         bicycle: "Bicycle"
+         car: "Car"
+         foot: "Foot"
+       providers:
+         fossgis_osrm: "OSRM"
+         graphhopper: "GraphHopper"
+         fossgis_valhalla: "Valhalla"
      key:
        table:
          entry:
@@@ -2897,7 -2905,6 +2905,7 @@@
            confirmed: Confirmed
            suspended: Suspended
            deleted: Deleted
 +        name_or_email: Name or Email
          ip_address: IP Address
          search: Search
        page:
@@@ -3096,7 -3103,6 +3104,7 @@@
        closed_title: "Resolved note #%{note_name}"
        hidden_title: "Hidden note #%{note_name}"
        description_when_author_is_deleted: "deleted"
 +      description_when_there_is_no_opening_comment: "unknown"
        event_opened_by_html: "Created by %{user} %{time_ago}"
        event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
        event_commented_by_html: "Comment from %{user} %{time_ago}"
@@@ -3229,16 -3235,6 +3237,6 @@@
      edit_help: Move the map and zoom in on a location you want to edit, then click here.
      directions:
        ascend: "Ascend"
-       engines:
-         fossgis_osrm_bike: "Bicycle (OSRM)"
-         fossgis_osrm_car: "Car (OSRM)"
-         fossgis_osrm_foot: "Foot (OSRM)"
-         graphhopper_bicycle: "Bicycle (GraphHopper)"
-         graphhopper_car: "Car (GraphHopper)"
-         graphhopper_foot: "Foot (GraphHopper)"
-         fossgis_valhalla_bicycle: "Bicycle (Valhalla)"
-         fossgis_valhalla_car: "Car (Valhalla)"
-         fossgis_valhalla_foot: "Foot (Valhalla)"
        descend: "Descend"
        directions: "Directions"
        distance: "Distance"