Merge branch 'master' into convert_roundabout_exits

diff --cc config/locales/en.yml
index 2c1ac016930c91787b78b793893e67cfacbfac9d,fd0317df11581af61fb24a2954041f264159d416..a2a575492bc5b4939f643622960147f34904e225
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2374,26 -2376,14 +2376,26 @@@ en
          destination_without_exit: Reach destination
          against_oneway_without_exit: Go against one-way on %{name}
          end_oneway_without_exit: End of one-way on %{name}
-         roundabout_with_exit: At roundabout take %{exit} exit onto %{name}
-         turn_left_with_exit: At roundabout turn left onto %{name}
-         slight_left_with_exit: At roundabout slight left onto %{name}
-         turn_right_with_exit: At roundabout turn right onto %{name}
-         slight_right_with_exit: At roundabout slight right onto %{name}
-         continue_with_exit: At roundabout continue straight onto %{name}
+         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+         turn_left_with_exit: Exit onto %{name}
+         slight_left_with_exit: Exit onto %{name}
+         turn_right_with_exit: Exit onto %{name}
+         slight_right_with_exit: Exit onto %{name}
+         continue_with_exit: Exit onto %{name}
          unnamed: "unnamed road"
          courtesy: "Directions courtesy of %{link}"
 +        exit_counts:
 +          one: "1st"
 +          two: "2nd"
 +          three: "3rd"
 +          four: "4th"
 +          five: "5th"
 +          six: "6th"
 +          seven: "7th"
 +          eight: "8th"
 +          nine: "9th"
 +          ten: "10th"
 +          gt_ten: ""
        time: "Time"
      query:
        node: Node