X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/70be43201aeb20d038ed66eefb87251e8efba87a..965fb0b3ae7c89ae46d606147811674d646b6acb:/config/locales/en.yml?ds=inline

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 53d5d541b..c40db82e2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -48,7 +48,7 @@ en:
         body: "Body"
       diary_entry:
         user: "User"
-        title: "Title"
+        title: "Subject"
         latitude: "Latitude"
         longitude: "Longitude"
         language: "Language"
@@ -66,7 +66,7 @@ en:
         description: "Description"
       message:
         sender: "Sender"
-        title: "Title"
+        title: "Subject"
         body: "Body"
         recipient: "Recipient"
       user:
@@ -79,7 +79,7 @@ en:
   printable_name:
     with_id: "%{id}"
     with_version: "%{id}, v%{version}"
-    with_name: "%{name} (%{id})"
+    with_name_html: "%{name} (%{id})"
   editor:
     default: "Default (currently %{name})"
     potlatch:
@@ -111,6 +111,7 @@ en:
     download_xml: "Download XML"
     view_history: "View History"
     view_details: "View Details"
+    location: "Location:"
     changeset:
       title: "Changeset: %{id}"
       belongs_to: "Author"
@@ -179,10 +180,13 @@ en:
       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
+      wikidata_link: "The %{page} item on Wikidata"
       wikipedia_link: "The %{page} article on Wikipedia"
+      telephone_link: "Call %{phone_number}"
     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}"
@@ -310,10 +314,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:
+        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"
+        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"
@@ -993,6 +1001,11 @@ en:
         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.
@@ -1053,7 +1066,7 @@ en:
       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: |
@@ -1075,6 +1088,26 @@ 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.
+  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: |
@@ -1612,9 +1645,6 @@ en:
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
-        myopenid:
-          title: Login with myOpenID
-          alt: Login with a myOpenID OpenID
         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID
@@ -1703,6 +1733,7 @@ en:
       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
@@ -2071,7 +2102,7 @@ en:
       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 or information from copyrighted maps or directory listings.)"
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.