From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Apr 2018 14:25:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1801'
X-Git-Tag: live~4105
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/10c3230e2716d5791e1007e5762988fec57e0a4d?hp=-c

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

10c3230e2716d5791e1007e5762988fec57e0a4d
diff --combined config/locales/en.yml
index 8a12d10a1,4540e74e8..af33f34f8
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2325,7 -2325,7 +2325,7 @@@ en
        distance: "Distance"
        errors:
          no_route: "Couldn't find a route between those two places."
 -        no_place: "Sorry - couldn't find that place."
 +        no_place: "Sorry - couldn't locate '%{place}'."
        instructions:
          continue_without_exit: Continue on %{name}
          slight_right_without_exit: Slight right onto %{name}
@@@ -2341,6 -2341,7 +2341,7 @@@
          onramp_right_with_directions: Turn right onto the ramp towards %{directions}
          onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions}
          onramp_right_without_directions: Turn right onto the ramp
+         onramp_right: Turn right onto the ramp
          endofroad_right_without_exit: At the end of the road turn right onto %{name}
          merge_right_without_exit: Merge right onto %{name}
          fork_right_without_exit: At the fork turn right onto %{name}
@@@ -2361,6 -2362,7 +2362,7 @@@
          onramp_left_with_directions: Turn left onto the ramp towards %{directions}
          onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions}
          onramp_left_without_directions: Turn left onto the ramp
+         onramp_left: Turn left onto the ramp
          endofroad_left_without_exit: At the end of the road turn left onto %{name}
          merge_left_without_exit: Merge left onto %{name}
          fork_left_without_exit: At the fork turn left onto %{name}