X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1729a680ac24bcf9fc45b97abe0228e41305bd57..f9570c4f054411c92007a146683f9f4724c1f9db:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ffb22bd60..32f4649da 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -162,6 +162,7 @@ en:
         way: way
         relation: relation
         changeset: changeset
+        note: note
     timeout:
       sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
       type:
@@ -169,6 +170,7 @@ en:
         way: way
         relation: relation
         changeset: changeset
+        note: note
     redacted:
       redaction: "Redaction %{id}"
       message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
@@ -248,6 +250,7 @@ en:
   diary_entry:
     new:
       title: New Diary Entry
+      publish_button: "Publish"
     list:
       title: "Users' diaries"
       title_friends: "Friends' diaries"
@@ -953,9 +956,6 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
-    donate_done_header: Thank You
-    donate_done_line_1: We hit our fundraising target!
-    donate_line_3: Hardware Funding Drive 2015
   license_page:
     foreign:
       title: About this translation
@@ -1197,7 +1197,7 @@ en:
   about_page:
     next: Next
     copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-    used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
+    used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
     lede_text: |
       OpenStreetMap is built by a community of mappers that contribute and maintain data
       about roads, trails, cafés, railway stations, and much more, all over the world.
@@ -1425,13 +1425,12 @@ en:
       table:
         entry:
           motorway: "Motorway"
+          main_road: "Main road"
           trunk: "Trunk road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
-          unsurfaced: "Unsurfaced road"
           track: "Track"
-          byway: "Byway"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           footway: "Footway"
@@ -1455,7 +1454,6 @@ en:
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"
-          tourist: "Tourist attraction"
           common:
             - Common
             - meadow
@@ -1485,7 +1483,6 @@ en:
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
-          permissive: "Permissive access"
           destination: "Destination access"
           construction: "Roads under construction"
     richtext_area:
@@ -1634,6 +1631,7 @@ en:
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_notes: "modify notes."
+      grant_access: "Grant Access"
     oauthorize_success:
       title: "Authorization request allowed"
       allowed: "You have granted application %{app_name} access to your account."
@@ -2235,29 +2233,32 @@ en:
         mapquest_car: "Car (MapQuest)"
         mapquest_foot: "Foot (MapQuest)"
         osrm_car: "Car (OSRM)"
+        mapzen_bicycle: "Bicycle (Mapzen)"
+        mapzen_car: "Car (Mapzen)"
+        mapzen_foot: "Foot (Mapzen)"
       directions: "Directions"
       distance: "Distance"
       errors:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't find that place."
       instructions:
-        continue_on: Continue on %{name}
-        slight_right: Slight right onto %{name}
-        turn_right: Turn right onto %{name}
-        sharp_right: Sharp right onto %{name}
-        uturn: U-turn along %{name}
-        sharp_left: Sharp left onto %{name}
-        turn_left: Turn left onto %{name}
-        slight_left: Slight left onto %{name}
-        via_point: (via point)
-        follow: Follow %{name}
-        roundabout: At roundabout take %{name}
-        leave_roundabout: Leave roundabout - %{name}
-        stay_roundabout: Stay on roundabout - %{name}
-        start: Start at end of %{name}
-        destination: Reach destination
-        against_oneway: Go against one-way on %{name}
-        end_oneway: End of one-way on %{name}
+        continue_without_exit: Continue on %{name}
+        slight_right_without_exit: Slight right onto %{name}
+        turn_right_without_exit: Turn right onto %{name}
+        sharp_right_without_exit: Sharp right onto %{name}
+        uturn_without_exit: U-turn along %{name}
+        sharp_left_without_exit: Sharp left onto %{name}
+        turn_left_without_exit: Turn left onto %{name}
+        slight_left_without_exit: Slight left onto %{name}
+        via_point_without_exit: (via point)
+        follow_without_exit: Follow %{name}
+        roundabout_without_exit: At roundabout take %{name}
+        leave_roundabout_without_exit: Leave roundabout - %{name}
+        stay_roundabout_without_exit: Stay on roundabout - %{name}
+        start_without_exit: Start at end of %{name}
+        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}
         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"