Merge remote-tracking branch 'origin/master' into routing

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8cb9c967453cfbd234795cbde79ce6e152aafbb3..4384fda865930c7249da06cdb449b73384bdaa99 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -184,6 +184,7 @@ en:
     note:
       title: "Note: %{id}"
       new_note: "New Note"
     note:
       title: "Note: %{id}"
       new_note: "New Note"

+      description: "Description"

       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"


@@ -2108,7 +2109,7 @@ en:
       map_data_zoom_in_tooltip: Zoom in to see map data
     notes:
       new:
       map_data_zoom_in_tooltip: Zoom in to see map data
     notes:
       new:

-        intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
+        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information here.)"

         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.


@@ -2122,10 +2123,12 @@ en:
       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"

-        mapquest_bike: "Bicycle (MapQuest)"
+        mapquest_bicycle: "Bicycle (MapQuest)"
+        mapquest_car: "Car (MapQuest)"
+        mapquest_foot: "Foot (MapQuest)"

         osrm_car: "Car (OSRM)"
         osrm_car: "Car (OSRM)"

-        cloudmade_foot: "Foot (Cloudmade)"

       directions: "Directions"
       directions: "Directions"

+      distance: "Distance"

       errors:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't find that place."
       errors:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't find that place."


@@ -2148,6 +2151,7 @@ en:
         against_oneway: "Go against one-way on "
         end_oneway: "End of one-way on "
         unnamed: "(unnamed)"
         against_oneway: "Go against one-way on "
         end_oneway: "End of one-way on "
         unnamed: "(unnamed)"

+      time: "Time"

   redaction:
     edit:
       description: "Description"
   redaction:
     edit:
       description: "Description"