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

diff --combined config/locales/en.yml
index c2815d142b784bf80e780fbb9573851af7cc3d77,0efe22cb20a92e5884f6b693050ed36f2507bbef..a3e086396e274d46f92df531a4133c7973f859e4
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -21,7 -21,7 +21,7 @@@ en
        client_application:
          create: Register
          update: Update
 -      doorkeeper_application:
 +      oauth2_application:
          create: Register
          update: Update
        redaction:
@@@ -2927,6 -2927,9 +2927,9 @@@
          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"