Change roundabout exit logic and remove blank string from locale file

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 94a97b98934b743977d11fddff8df33a2c6bca05..e9644b657a12a58e619f01c3f8dbe90172838c7a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -230,7 +230,7 @@ en:
     list:
       title: "Changesets"
       title_user: "Changesets by %{user}"
-      title_friend: "Changesets by your friends"
+      title_friend: "Changesets by my friends"
       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."
@@ -259,7 +259,7 @@ en:
       user_title: "%{user}'s diary"
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
-      new_title: Compose a new entry in your user diary
+      new_title: Compose a new entry in my user diary
       no_entries: No diary entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries
@@ -1611,7 +1611,7 @@ en:
     trace_header:
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
-      see_your_traces: "See your traces"
+      see_my_traces: "See my traces"
       traces_waiting:
         one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
@@ -1658,7 +1658,7 @@ en:
       map: "map"
     list:
       public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
+      my_traces: "My GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
@@ -1923,7 +1923,7 @@ en:
       user location: User location
       if set location: "Set your home location on the %{settings_link} page to see nearby users."
       settings_link_text: settings
-      your friends: Your friends
+      my friends: My friends
       no friends: You have not added any friends yet.
       km away: "%{count}km away"
       m away: "%{count}m away"
@@ -2374,7 +2374,7 @@ 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}
+        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}
@@ -2382,6 +2382,17 @@ en:
         continue_with_exit: At roundabout continue straight 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"
       time: "Time"
     query:
       node: Node