Merge branch 'master' into convert_roundabout_exits

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9e923185d1bb8fb413b4e4a340074abd3d213f58..a2a575492bc5b4939f643622960147f34904e225 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2377,13 +2377,25 @@ en:
         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}
+        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