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

diff --combined config/locales/en.yml
index ddcc672cc17b26d84517d668418639f5ed19bc91,c4c53f05906f8fa93b80234717e8cf62e3da70ff..35ba0650bc2f6475d528e3ec37a3f50458e2c533
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2529,11 -2529,10 +2529,11 @@@ en
          track: "Track"
          bridleway: "Bridleway"
          cycleway: "Cycleway"
 -        cycleway_national: "National cycleway"
 -        cycleway_regional: "Regional cycleway"
 -        cycleway_local: "Local cycleway"
 -        cycleway_mtb: "Mountain bike route"
 +        international_bike_route: "International bike route"
 +        national_bike_route: "National bike route"
 +        regional_bike_route: "Regional bike route"
 +        local_bike_route: "Local bike route"
 +        mountain_bike_route: "Mountain bike route"
          footway: "Footway"
          rail: "Railway"
          train: "Train"
@@@ -3349,6 -3348,7 +3349,7 @@@
          roundabout_with_exit: At the roundabout take the exit %{exit} onto %{name}
          roundabout_with_exit_ordinal: At the roundabout take the %{exit} exit onto %{name}
          exit_roundabout: Exit the roundabout onto %{name}
+         ferry_without_exit: Take the ferry %{name}
          unnamed: "unnamed road"
          courtesy: "Directions courtesy of %{link}"
          exit_counts: