Drop incorrect Station suffix for railway=subway

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e82fbdf02d6184b16261a635d95a9b313846bc39..b658a1bf4bde4a0521fc9ab816e0494c93a9deb5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -759,7 +759,7 @@ en:
           spur: "Railway Spur"
           station: "Railway Station"
           stop: "Railway Stop"
-          subway: "Subway Station"
+          subway: "Subway"
           subway_entrance: "Subway Entrance"
           switch: "Railway Points"
           tram: "Tramway"
@@ -902,19 +902,6 @@ en:
     results:
       no_results: "No results found"
       more_results: "More results"
-    distance:
-      zero: "less than 1km"
-      one: "about 1km"
-      other: "about %{count}km"
-    direction:
-      south_west: "south-west"
-      south: "south"
-      south_east: "south-east"
-      east: "east"
-      north_east: "north-east"
-      north: "north"
-      north_west: "north-west"
-      west: "west"
   layouts:
     project_name:
       # in <title>
@@ -1380,8 +1367,6 @@ en:
       search: Search
       get_directions: "Get directions"
       get_directions_title: "Find directions between two points"
-      close_directions: "Close directions"
-      close_directions_title: "Close the directions panel"
       from: "From"
       to: "To"
       where_am_i: "Where am I?"
@@ -1910,6 +1895,7 @@ en:
         Confirm your account by clicking on the link in the email and you'll be able to start mapping.
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
+      success: "Confirmed your account, thanks for signing up!"
       already active: "This account has already been confirmed."
       unknown token: "That confirmation code has expired or does not exist."
       reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
@@ -1920,8 +1906,9 @@ en:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
       button: Confirm
-      success: "Confirmed your email address, thanks for signing up!"
+      success: "Confirmed your change of email address!"
       failure: "An email address has already been confirmed with this token."
+      unknown_token: "That confirmation code has expired or does not exist."
     set_home:
       flash success: "Home location saved successfully"
     go_public:
@@ -2193,23 +2180,24 @@ en:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't find that place."
       instructions:
-        continue_on: "Continue on "
-        slight_right: "Slight right onto "
-        turn_right: "Turn right onto "
-        sharp_right: "Sharp right onto "
-        uturn: "U-turn along "
-        sharp_left: "Sharp left onto "
-        turn_left: "Turn left onto "
-        slight_left: "Slight left onto "
-        via_point: "(via point) "
-        follow:  "Follow "
-        roundabout: "At roundabout take "
-        leave_roundabout: "Leave roundabout - "
-        stay_roundabout: "Stay on roundabout - "
-        start: "Start at end of "
-        destination: "Reach destination"
-        against_oneway: "Go against one-way on "
-        end_oneway: "End of one-way on "
+        continue_on: Continue on
+        slight_right: Slight right onto
+        turn_right: Turn right onto
+        sharp_right: Sharp right onto
+        uturn: U-turn along
+        sharp_left: Sharp left onto
+        turn_left: Turn left onto
+        slight_left: Slight left onto
+        via_point: (via point)
+        follow: Follow
+        roundabout: At roundabout take
+        leave_roundabout: Leave roundabout -
+        stay_roundabout: Stay on roundabout -
+        start: Start at end of
+        destination: Reach destination
+        against_oneway: Go against one-way on
+        end_oneway: End of one-way on
+        exit: exit %{exit}
         unnamed: "(unnamed)"
         courtesy: "Directions courtesy of %{link}"
       time: "Time"