X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/06c2db433d63ebd0e5a83cb6b68a29a6ca1d5050..d29807d715d3d493f8af631c9631feeb702912e1:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b2592c1c2..166278810 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -504,7 +504,9 @@ en:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
-      has_commented_on: "%{display_name} has commented on the following diary entries"
+      title: "Diary Comments added by %{user}"
+      heading: "%{user}'s Diary Comments"
+      subheading_html: "Diary Comments added by %{user}"
       no_comments: "No diary comments"
       post: Post
       when: When
@@ -781,7 +783,6 @@ en:
           siren: "Emergency Siren"
           suction_point: "Emergency Suction Point"
           water_tank: "Emergency Water Tank"
-          "yes": "Emergency"
         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
@@ -828,6 +829,7 @@ en:
           trailhead: "Trailhead"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
+          turning_circle: "Turning Circle"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
           "yes" : "Road"
@@ -1865,9 +1867,8 @@ en:
         credit_3_1_html: |
           The map tiles in the “standard style” at www.openstreetmap.org are a
           Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
-          under the Open Database License. If you are using these tiles please use
-          the following attribution:
-          “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+          under the Open Database License. When using this map style, the same attribution is
+          required as for the map data.
         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
@@ -2228,7 +2229,7 @@ en:
       title: Communities
       lede_text: |
         People from all over the world contribute to or use OpenStreetMap.
-        Whilst some are content to participate as individuals, others have formed communities.
+        While many participate as individuals, others have formed communities.
         These groups come in a range of sizes and represent geographies from small towns to large multi-country regions.
         They can also be formal or informal.
       local_chapters:
@@ -2240,7 +2241,7 @@ en:
           with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright
           governing body.
         list_text: |
-          So far we have the following formally established foundation Local Chapters:
+          Currently we have the following formally established Local Chapters:
       other_groups:
         title: Other Groups
         about_html: |
@@ -2393,6 +2394,8 @@ en:
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
+      read_email: Read user email address
+      skip_authorization: Auto approve application
   oauth_clients:
     new:
       title: "Register a new application"
@@ -2647,6 +2650,7 @@ en:
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope
+      unknown_error: Authentication failed
     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |