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 56890371c601d2fec8450c10633264cc168dbf7b..c4f757b76180f3ed1b811e8413fe94bb041b167c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -48,7 +48,7 @@ en:
         body: "Body"
       diary_entry:
         user: "User"
         body: "Body"
       diary_entry:
         user: "User"

-        title: "Title"
+        title: "Subject"

         latitude: "Latitude"
         longitude: "Longitude"
         language: "Language"
         latitude: "Latitude"
         longitude: "Longitude"
         language: "Language"


@@ -66,7 +66,7 @@ en:
         description: "Description"
       message:
         sender: "Sender"
         description: "Description"
       message:
         sender: "Sender"

-        title: "Title"
+        title: "Subject"

         body: "Body"
         recipient: "Recipient"
       user:
         body: "Body"
         recipient: "Recipient"
       user:


@@ -95,87 +95,63 @@ en:
       name: "Remote Control"
       description: "Remote Control (JOSM or Merkaartor)"
   browse:
       name: "Remote Control"
       description: "Remote Control (JOSM or Merkaartor)"
   browse:

+    created: "Created"
+    closed: "Closed"
+    created_html: "Created <abbr title='%{title}'>%{time} ago</abbr>"
+    closed_html: "Closed <abbr title='%{title}'>%{time} ago</abbr>"
+    created_by_html: "Created <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    deleted_by_html: "Deleted <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    edited_by_html: "Edited <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    closed_by_html: "Closed <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    version: "Version"
+    in_changeset: "Changeset"
+    anonymous: "anonymous"
+    no_comment: "(no comment)"
+    part_of: "Part of"
+    download_xml: "Download XML"
+    view_history: "View History"
+    view_details: "View Details"
+    location: "Location:"

     changeset:
     changeset:

-      title: "Changeset"
-      changeset: "Changeset %{id}"
+      title: "Changeset: %{id}"
+      belongs_to: "Author"
+      node: "Nodes (%{count})"
+      node_paginated: "Nodes (%{x}-%{y} of %{count})"
+      way: "Ways (%{count})"
+      way_paginated: "Ways (%{x}-%{y} of %{count})"
+      relation: "Relations (%{count})"
+      relation_paginated: "Relations (%{x}-%{y} of %{count})"

       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"

-    navigation:
-      paging:
-        user:
-          prev: "« %{id}"
-          next: "%{id} »"
-        all:
-          prev: "« %{id}"
-          next: "%{id} »"
-      user:
-        name_changeset_tooltip: "View edits by %{user}"
-        prev_changeset_tooltip: "Previous edit by %{user}"
-        next_changeset_tooltip: "Next edit by %{user}"
-      all:
-        prev_node_tooltip: "Previous node"
-        next_node_tooltip: "Next node"
-        prev_way_tooltip: "Previous way"
-        next_way_tooltip: "Next way"
-        prev_relation_tooltip: "Previous relation"
-        next_relation_tooltip: "Next relation"
-        prev_changeset_tooltip: "Previous changeset"
-        next_changeset_tooltip: "Next changeset"
-        prev_note_tooltip: "Previous note"
-        next_note_tooltip: "Next note"
-    changeset_details:
-      created_at: "Created"
-      closed_at: "Closed"
-      belongs_to: "Author"
-      has_nodes: "Nodes (%{count})"
-      has_ways: "Ways (%{count})"
-      has_relations: "Relations (%{count})"
-      no_comment: "(no comment)"
-      ago: "%{ago} ago"
-    common_details:
-      edited: "Edited"
-      deleted: "Deleted"
-      by: "by"
-      version: "Version"
-      in_changeset: "Changeset"
-      changeset_comment: "Comment"
+    node:
+      title: "Node: %{name}"
+      history_title: "Node History: %{name}"
+    way:
+      title: "Way: %{name}"
+      history_title: "Way History: %{name}"
+      nodes: "Nodes"
+      also_part_of:
+        one: "part of way %{related_ways}"
+        other: "part of ways %{related_ways}"
+    relation:
+      title: "Relation: %{name}"
+      history_title: "Relation History: %{name}"
+      members: "Members"
+    relation_member:
+      entry: "%{type} %{name}"
+      entry_role: "%{type} %{name} as %{role}"
+      type:
+        node: "Node"
+        way: "Way"
+        relation: "Relation"

     containing_relation:
       entry: "Relation %{relation_name}"
       entry_role: "Relation %{relation_name} (as %{relation_role})"
     containing_relation:
       entry: "Relation %{relation_name}"
       entry_role: "Relation %{relation_name} (as %{relation_role})"

-    map:
-      loading: "Loading..."
-      deleted: "Deleted"
-      larger:
-        area: "View area on larger map"
-        node: "View node on larger map"
-        way: "View way on larger map"
-        relation: "View relation on larger map"
-        note: "View note on larger map"
-      edit:
-        area: "Edit area"
-        node: "Edit node"
-        way: "Edit way"
-        relation: "Edit relation"
-        note: "Edit note"
-    node_details:
-      coordinates: "Coordinates:"
-      part_of: "Part of:"
-    node_history:
-      node_history: "Node History"
-      node_history_title: "Node History: %{node_name}"
-      download_xml: "Download XML"
-      view_details: "View details"
-    node:
-      node: "Node"
-      node_title: "Node: %{node_name}"
-      download_xml: "Download XML"
-      view_history: "View history"
-      edit: "Edit node"

     not_found:
     not_found:

-      sorry: "Sorry, the %{type} with the id %{id}, could not be found."
+      sorry: "Sorry, %{type} #%{id} could not be found."

       type:
         node: node
         way: way
       type:
         node: node
         way: way


@@ -188,9 +164,6 @@ en:
         way: way
         relation: relation
         changeset: changeset
         way: way
         relation: relation
         changeset: changeset

-    paging_nav:
-      showing_page: "page"
-      of: "of"

     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."
     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."


@@ -198,111 +171,45 @@ en:
         node: "node"
         way: "way"
         relation: "relation"
         node: "node"
         way: "way"
         relation: "relation"

-    relation_details:
-      members: "Members:"
-      part_of: "Part of:"
-    relation_history:
-      relation_history: "Relation History"
-      relation_history_title: "Relation History: %{relation_name}"
-      download_xml: "Download XML"
-      view_details: "View details"
-    relation_member:
-      entry: "%{type} %{name}"
-      entry_role: "%{type} %{name} as %{role}"
-      type:
-        node: "Node"
-        way: "Way"
-        relation: "Relation"
-    relation:
-      relation: "Relation"
-      relation_title: "Relation: %{relation_name}"
-      download_xml: "Download XML"
-      view_history: "View history"

     start_rjs:
     start_rjs:

-      notes_layer_name: "Browse Notes"
-      data_layer_name: "Browse Map Data"
-      data_frame_title: "Data"
-      zoom_or_select: "Zoom in or select an area of the map to view"
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"
-      hide_areas: "Hide areas"
-      show_areas: "Show areas"
-      loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"

       load_data: "Load Data"
       load_data: "Load Data"

-      unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})"

       loading: "Loading..."
       loading: "Loading..."

-      show_history: "Show History"
-      wait: "Wait..."
-      history_for_feature: "History for %{feature}"
-      details: "Details"
-      private_user: "private user"
-      edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
-      object_list:
-        heading: "Object list"
-        back: "Back to object list"
-        type:
-          node: "Node"
-          way: "Way"
-          # There is no 'relation' type because it is not represented in OpenLayers
-        api: "Retrieve this area from the API"
-        details: "Details"
-        selected:
-          type:
-            node: "Node %{id}"
-            way: "Way %{id}"
-            # There is no 'relation' type because it is not represented in OpenLayers
-        history:
-          type:
-            node: "Node %{id}"
-            way: "Way %{id}"
-            # There is no 'relation' type because it is not represented in OpenLayers

     tag_details:
       tags: "Tags"
       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
       wikipedia_link: "The %{page} article on Wikipedia"
     tag_details:
       tags: "Tags"
       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
       wikipedia_link: "The %{page} article on Wikipedia"

-    way_details:
-      nodes: "Nodes:"
-      part_of: "Part of:"
-      also_part_of:
-        one: "part of way %{related_ways}"
-        other: "part of ways %{related_ways}"
-    way_history:
-      way_history: "Way History"
-      way_history_title: "Way History: %{way_name}"
-      download_xml: "Download XML"
-      view_details: "View details"
-    way:
-      way: "Way"
-      way_title: "Way: %{way_name}"
-      download_xml: "Download XML"
-      view_history: "View history"
-      edit: "Edit way"

     note:
     note:

-      title: "Note"
-      open_title: "Unresolved note: %{note_name}"
-      closed_title: "Resolved note: %{note_name}"
-      opened: "Opened"
-      last_modified: "Last modified"
-      closed: "Closed"
-      at_html: "%{when} ago"
-      at_by_html: "%{when} ago by %{user}"
+      title: "Note: %{id}"
+      new_note: "New Note"

       description: "Description"
       description: "Description"

-      comments: "Comments"
-      anonymous: "anonymous"
+      open_title: "Unresolved note #%{note_name}"
+      closed_title: "Resolved note #%{note_name}"
+      hidden_title: "Hidden note #%{note_name}"
+      open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      closed_by_anonymous: "Resolved by anonymous <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}"
       next: "Next »"
       previous: "« Previous"
     changeset:
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"
       next: "Next »"
       previous: "« Previous"
     changeset:

-      still_editing: "(still editing)"

       anonymous: "Anonymous"
       anonymous: "Anonymous"

-      no_comment: "(no comment)"

       no_edits: "(no edits)"
       no_edits: "(no edits)"

-      show_area_box: "show area box"
-      big_area: "(big)"

       view_changeset_details: "View changeset details"
     changesets:
       id: "ID"
       view_changeset_details: "View changeset details"
     changesets:
       id: "ID"


@@ -315,8 +222,12 @@ en:
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by your friends"
       title_nearby: "Changesets by nearby users"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by your friends"
       title_nearby: "Changesets by nearby users"

-      empty: "No changesets in this area."
-      no_more: "No more changesets in this area."
+      empty: "No changesets found."
+      empty_area: "No changesets in this area."
+      empty_user: "No changesets by this user."
+      no_more: "No more changesets found."
+      no_more_area: "No more changesets in this area."
+      no_more_user: "No more changesets by this user."

       load_more: "Load more"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
       load_more: "Load more"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."


@@ -395,6 +306,7 @@ en:
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   export:
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   export:

+    title: "Export"

     start:
       area_to_export: "Area to Export"
       manually_select: "Manually select a different area"
     start:
       area_to_export: "Area to Export"
       manually_select: "Manually select a different area"


@@ -405,11 +317,14 @@ en:
       licence: "Licence"
       export_details: 'OpenStreetMap data is licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
       too_large:
       licence: "Licence"
       export_details: 'OpenStreetMap data is licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
       too_large:

-        heading: "Area Too Large"
-        body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the following sources for bulk data downloads:"
+        advice: "If the above export fails, please consider using one of the sources listed below:"
+        body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."

         planet:
           title: "Planet OSM"
           description: "Regularly-updated copies of the complete OpenStreetMap database"
         planet:
           title: "Planet OSM"
           description: "Regularly-updated copies of the complete OpenStreetMap database"

+        overpass:
+          title: "Overpass API"
+          description: "Download this bounding box from a mirror of the OpenStreetMap database"

         geofabrik:
           title: "Geofabrik Downloads"
           description: "Regularly-updated extracts of continents, countries, and selected cities"
         geofabrik:
           title: "Geofabrik Downloads"
           description: "Regularly-updated extracts of continents, countries, and selected cities"


@@ -431,16 +346,10 @@ en:
       output: "Output"
       paste_html: "Paste HTML to embed in website"
       export_button: "Export"
       output: "Output"
       paste_html: "Paste HTML to embed in website"
       export_button: "Export"

-    start_rjs:
-      export: "Export"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"

   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

+        latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'

         us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'


@@ -603,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"


@@ -814,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"


@@ -977,13 +888,12 @@ en:
     logo:
       alt_text: OpenStreetMap logo
     home: Go to Home Location
     logo:
       alt_text: OpenStreetMap logo
     home: Go to Home Location

-    logout: Logout
+    logout: Log Out

     log_in: Log In
     log_in_tooltip: Log in with an existing account
     sign_up: Sign Up
     log_in: Log In
     log_in_tooltip: Log in with an existing account
     sign_up: Sign Up

+    start_mapping: Start Mapping

     sign_up_tooltip: Create an account for editing
     sign_up_tooltip: Create an account for editing

-    view: View
-    view_tooltip: View the map

     edit: Edit
     history: History
     export: Export
     edit: Edit
     history: History
     export: Export


@@ -996,7 +906,7 @@ en:
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map
     intro_header: Welcome to OpenStreetMap!
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map
     intro_header: Welcome to OpenStreetMap!

-    intro_text: OpenStreetMap is a free and editable map of the world maintained by an active community of contributors.
+    intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.

     intro_2_create_account: "Create a user account"
     partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
     partners_ucl: "the UCL VR Centre"
     intro_2_create_account: "Create a user account"
     partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
     partners_ucl: "the UCL VR Centre"


@@ -1009,7 +919,7 @@ en:
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     help: Help
     about: About
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     help: Help
     about: About

-    copyright: "Copyright & License"
+    copyright: Copyright

     community: Community
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     community: Community
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"


@@ -1018,7 +928,8 @@ en:
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation

-
+    learn_more: "Learn More"
+    more: More

   license_page:
     foreign:
       title: About this translation
   license_page:
     foreign:
       title: About this translation


@@ -1095,6 +1006,11 @@ en:
         Resources Canada), CanVec (&copy; Department of Natural
         Resources Canada), and StatCan (Geography Division,
         Statistics Canada).
         Resources Canada), CanVec (&copy; Department of Natural
         Resources Canada), and StatCan (Geography Division,
         Statistics Canada).

+      contributors_fi_html: |
+        <strong>Finland</strong>: Contains data from the
+        National Land Survey of Finland's Topographic Database
+        and other datasets, under the
+        <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.

       contributors_fr_html: |
         <strong>France</strong>: Contains data sourced from
         Direction Générale des Impôts.
       contributors_fr_html: |
         <strong>France</strong>: Contains data sourced from
         Direction Générale des Impôts.


@@ -1155,7 +1071,7 @@ en:
       editor_html: |
         An <strong>editor</strong> is a program or website you can use to edit the map.
       node_html: |
       editor_html: |
         An <strong>editor</strong> is a program or website you can use to edit the map.
       node_html: |

-        A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.
+        A <strong>node</strong> is a point on the map, like a single restaurant or a tree.

       way_html: |
         A <strong>way</strong> is a line or area, like a road, stream, lake or building.
       tag_html: |
       way_html: |
         A <strong>way</strong> is a line or area, like a road, stream, lake or building.
       tag_html: |


@@ -1177,13 +1093,33 @@ en:
         Just go to <a href='%{map_url}'>the map</a> and click the note icon:
         <span class='icon note'></span>. This will add a marker to the map, which you can move
         by dragging. Add your message, then click save, and other mappers will investigate.
         Just go to <a href='%{map_url}'>the map</a> and click the note icon:
         <span class='icon note'></span>. This will add a marker to the map, which you can move
         by dragging. Add your message, then click save, and other mappers will investigate.

+  fixthemap:
+    title: Report a problem / Fix the map
+    how_to_help:
+      title: How to Help
+      join_the_community:
+        title: Join the community
+        explanation_html: |
+          If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
+          proceed is to join the OpenStreetMap community and add or repair the data yourself. 
+      add_a_note:
+        instructions_html: |
+          Just click <a class='icon note'></a> or the same icon on the map display.
+          This will add a marker to the map, which you can move
+          by dragging. Add your message, then click save, and other mappers will investigate.
+    other_concerns:
+      title: Other concerns
+      explanation_html: |
+        If you have concerns about how our data is being used or about the contents please consult our
+        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate 
+        <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.  

   help_page:
     title: Getting Help
     introduction: |
       OpenStreetMap has several resources for learning about the project, asking and answering questions,
       and collaboratively discussing and documenting mapping topics.
     welcome:
   help_page:
     title: Getting Help
     introduction: |
       OpenStreetMap has several resources for learning about the project, asking and answering questions,
       and collaboratively discussing and documenting mapping topics.
     welcome:

-      url: http://www.openstreetmap.org/welcome
+      url: /welcome

       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
     help:
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
     help:


@@ -1199,19 +1135,20 @@ en:
     copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
     used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
     lede_text: |
     copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
     used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
     lede_text: |

-      OSM is built by a community of local mappers that keeps data about
-      roads, cafés, subway stations, and much more up to date every day.
+      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.

     local_knowledge_title: Local Knowledge
     local_knowledge_html: |
       OpenStreetMap emphasizes local knowledge. Contributors use
       aerial imagery, GPS devices, and low-tech field maps to verify that OSM
     local_knowledge_title: Local Knowledge
     local_knowledge_html: |
       OpenStreetMap emphasizes local knowledge. Contributors use
       aerial imagery, GPS devices, and low-tech field maps to verify that OSM

-      is up to date and accurate.
+      is accurate and up to date.

     community_driven_title: Community Driven
     community_driven_html: |
     community_driven_title: Community Driven
     community_driven_html: |

-      From the engineers that tune OSM's servers to the Humanitarian OSM Team
-      that maps disaster-affected areas, OSM's community is diverse,
-      passionate, and growing every day. To learn more about the community,
-      see the <a href='%{diary_path}'>user diaries</a>,
+      OpenStreetMap's community is diverse, passionate, and growing every day.
+      Our contributors include enthusiast mappers, GIS professionals, engineers
+      running the OSM servers, humanitarians mapping disaster-affected areas,
+      and many more.
+      To learn more about the community, see the <a href='%{diary_path}'>user diaries</a>,

       <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
       the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
     open_data_title: Open Data
       <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
       the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
     open_data_title: Open Data


@@ -1221,26 +1158,7 @@ en:
       build upon the data in certain ways, you may distribute the result only
       under the same licence. See the <a href='%{copyright_path}'>Copyright and
       License page</a> for details.
       build upon the data in certain ways, you may distribute the result only
       under the same licence. See the <a href='%{copyright_path}'>Copyright and
       License page</a> for details.

-    photo_caption_0_html: |
-      <a href='https://twitter.com/mikel'>@mikel</a> working on
-      <a href='http://mapkibera.org/'>Map Kibera</a>, a project to map the
-      largest slum in Nairobi, Kenya.
-      <a href='http://www.flickr.com/photos/watato/4564778295'>&copy; watato
-      2010</a>
-    photo_caption_1_html: |
-      <a href='https://twitter.com/lxbarth'>@lxbarth</a> and
-      <a href='https://twitter.com/limareis'>@limareis</a> survey Brasilia with
-      walking papers.
-      <a href='http://www.flickr.com/photos/mapbox/7104560119'>&copy; mapbox
-      2012</a>
-    photo_caption_2_html: |
-      @TODO caption (<a href='http://www.flickr.com/photos/oddwick/4775001075'>source</a>)
-    photo_caption_3_html: |
-      @TODO caption (<a href='http://www.flickr.com/photos/28698126@N02/3012439281'>source</a>)
-    photo_caption_4_html: |
-      @TODO caption (<a href='http://www.flickr.com/photos/louis_liu/4875155429/'>source</a>)
-    photo_caption_5_html: |
-      @TODO caption (<a href='http://www.flickr.com/photos/kachkaev/5793019627'>source</a>)
+    partners_title: Partners

   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"


@@ -1620,6 +1538,7 @@ en:
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
     oauthorize:
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
     oauthorize:

+      title: "Authorize access to your account"

       request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."
       request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."


@@ -1629,6 +1548,14 @@ en:
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_notes: "modify notes."
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_notes: "modify notes."

+    oauthorize_success:
+      title: "Authorization request allowed"
+      allowed: "You have granted application %{app_name} access to your account."
+      verification: "The verification code is %{code}."
+    oauthorize_failure:
+      title: "Authorization request failed"
+      denied: "You have denied application %{app_name} access to your account."
+      invalid: "The authorization token is not valid."

     revoke:
       flash: "You've revoked the token for %{application}"
   oauth_clients:
     revoke:
       flash: "You've revoked the token for %{application}"
   oauth_clients:


@@ -1814,6 +1741,7 @@ en:
       my edits: My Edits
       my traces: My Traces
       my notes: My Notes
       my edits: My Edits
       my traces: My Traces
       my notes: My Notes

+      my messages: My Messages

       my profile: My Profile
       my settings: My Settings
       my comments: My Comments
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments


@@ -2172,32 +2100,33 @@ en:
         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"

+      donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"

     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
       createnote_tooltip: Add a note to the map
       createnote_disabled_tooltip: Zoom in to add a note to the map
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
       createnote_tooltip: Add a note to the map
       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:
     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:
         add: Add Note
       show:

-        permalink: Permalink

         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.

-        opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
-        opened_by_anonymous: "created by anonymous at %{time}"
-        commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
-        commented_by_anonymous: "comment from anonymous at %{time}"
-        closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
-        closed_by_anonymous: "resolved by anonymous at %{time}"
-        reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
-        reopened_by_anonymous: "reactivated by anonymous at %{time}"

         hide: Hide
         resolve: Resolve
         reactivate: Reactivate
         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.
         hide: Hide
         resolve: Resolve
         reactivate: Reactivate
         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"