Pivot areas to the underlying way or relation object

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c305a381c57bea12fbb544fdf7604db28fe64499..c4f757b76180f3ed1b811e8413fe94bb041b167c 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}"


@@ -196,6 +197,11 @@ en:
       reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
       reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
       hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
       reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
       reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
       hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"

+    query:
+      title: "Query Features"
+      introduction: "Click on the map to find nearby features."
+      nearby: "Nearby features"
+      enclosing: "Enclosing features"

   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"


@@ -506,7 +512,7 @@ en:
           primary_link: "Primary Road"
           proposed: "Proposed Road"
           raceway: "Raceway"
           primary_link: "Primary Road"
           proposed: "Proposed Road"
           raceway: "Raceway"

-          residential: "Residential"
+          residential: "Residential Road"

           rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"
           rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"


@@ -717,6 +723,8 @@ en:
           tram: "Tramway"
           tram_stop: "Tram Stop"
           yard: "Railway Yard"
           tram: "Tramway"
           tram_stop: "Tram Stop"
           yard: "Railway Yard"

+        route:
+          bus: "Bus Route"

         shop:
           alcohol: "Off License"
           antiques: "Antiques"
         shop:
           alcohol: "Off License"
           antiques: "Antiques"


@@ -2100,6 +2108,8 @@ en:
       createnote_disabled_tooltip: Zoom in to add a note to the map
       map_notes_zoom_in_tooltip: Zoom in to see map notes
       map_data_zoom_in_tooltip: Zoom in to see map data
       createnote_disabled_tooltip: Zoom in to add a note to the map
       map_notes_zoom_in_tooltip: Zoom in to see map notes
       map_data_zoom_in_tooltip: Zoom in to see map data

+      queryfeature_tooltip: Query features
+      queryfeature_disabled_tooltip: Zoom in to query features

     notes:
       new:
         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.)"
     notes:
       new:
         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.)"


@@ -2112,6 +2122,11 @@ en:
         comment_and_resolve: Comment & Resolve
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
         comment_and_resolve: Comment & Resolve
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.

+    query:
+      node: Node
+      way: Way
+      relation: Relation
+      nothing_found: No features found

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