X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bd7c279604469e0ef22ed8148603befa469d9c2b..c87d316a1d65ce7fa4b47a6027b2ea5a7b3dbbcc:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7c3ae073e..30e8f6e98 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -42,6 +42,7 @@ en:
       diary_comment: "Diary Comment"
       diary_entry: "Diary Entry"
       friend: "Friend"
+      issue: "Issue"
       language: "Language"
       message: "Message"
       node: "Node"
@@ -58,6 +59,7 @@ en:
       relation: "Relation"
       relation_member: "Relation Member"
       relation_tag: "Relation Tag"
+      report: "Report"
       session: "Session"
       trace: "Trace"
       tracepoint: "Trace Point"
@@ -160,6 +162,15 @@ en:
     remote:
       name: "Remote Control"
       description: "Remote Control (JOSM or Merkaartor)"
+  auth:
+    providers:
+      none: None
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -362,6 +373,7 @@ en:
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       new_title: Compose a new entry in my user diary
+      my_diary: My Diary
       no_entries: No diary entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries
@@ -382,7 +394,7 @@ en:
     diary_entry:
       posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
       comment_link: Comment on this entry
-      reply_link: Reply to this entry
+      reply_link: Send a message to the author
       comment_count:
         zero: No comments
         one: "%{count} comment"
@@ -419,6 +431,18 @@ en:
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
+  friendships:
+    make_friend:
+      heading: "Add %{user} as a friend?"
+      button: "Add as friend"
+      success: "%{name} is now your friend!"
+      failed: "Sorry, failed to add %{name} as a friend."
+      already_a_friend: "You are already friends with %{name}."
+    remove_friend:
+      heading: "Unfriend %{user}?"
+      button: "Unfriend"
+      success: "%{name} was removed from your friends."
+      not_a_friend: "%{name} is not one of your friends."
   geocoder:
     search:
       title:
@@ -1070,11 +1094,10 @@ en:
     reopen:
       reopened: Issue status has been set to 'Open'
     comments:
-      created_at: "On %{datetime}"
+      comment_from_html: "Comment from %{user_link} on %{comment_created_at}"
       reassign_param: Reassign Issue?
     reports:
-      updated_at: "On %{datetime}"
-      reported_by_html: "Reported as %{category} by %{user}"
+      reported_by_html: "Reported as %{category} by %{user} on %{updated_at}"
     helper:
       reportable_title:
         diary_comment: "%{entry_title}, comment #%{comment_id}"
@@ -1174,13 +1197,13 @@ en:
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
-      footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
+      footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
     message_notification:
       subject_header: "[OpenStreetMap] %{subject}"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
-      footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
-    friend_notification:
+      footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
+    friendship_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
@@ -1200,7 +1223,9 @@ en:
         import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       success:
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+        loaded_successfully:
+          one: loaded successfully with %{trace_points} out of a possible 1 point.
+          other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"
@@ -1330,7 +1355,7 @@ en:
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-      used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
+      used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices"
       lede_text: |
         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.
@@ -1394,26 +1419,30 @@ en:
           may distribute the result only under the same licence. The
           full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains your rights and responsibilities.
-        intro_3_html: |
-          The cartography in our map tiles, and our documentation, are
-          licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
+        intro_3_1_html: |
+          Our documentation is licensed under the 
+          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |
           We require that you use the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_html: |
+        credit_2_1_html: |
           You must also make it clear that the data is available under the Open
-          Database License, and if using our map tiles, that the cartography is
-          licensed as CC BY-SA. You may do this by linking to
+          Database License. You may do this by linking to
           <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
           Alternatively, and as a requirement if you are distributing OSM in a
           data form, you can name and link directly to the license(s). In media
           where links are not possible (e.g. printed works), we suggest you
           direct your readers to openstreetmap.org (perhaps by expanding
-          'OpenStreetMap' to this full address), to opendatacommons.org, and
-          if relevant, to creativecommons.org.
-        credit_3_html: |
+          'OpenStreetMap' to this full address) and to opendatacommons.org.
+        credit_3_1_html: |
+          The map tiles in the &ldquo;standard style&rdquo; 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: 
+          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;. 
+        credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         attribution_example:
@@ -2259,17 +2288,6 @@ en:
       flash success: "Home location saved successfully"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
-    make_friend:
-      heading: "Add %{user} as a friend?"
-      button: "Add as friend"
-      success: "%{name} is now your friend!"
-      failed: "Sorry, failed to add %{name} as a friend."
-      already_a_friend: "You are already friends with %{name}."
-    remove_friend:
-      heading: "Unfriend %{user}?"
-      button: "Unfriend"
-      success: "%{name} was removed from your friends."
-      not_a_friend: "%{name} is not one of your friends."
     index:
       title: Users
       heading: Users
@@ -2430,7 +2448,7 @@ en:
       next: "Next »"
       previous: "« Previous"
   notes:
-    mine:
+    index:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
       subheading_html: "Notes submitted or commented on by %{user}"
@@ -2473,14 +2491,18 @@ en:
         out: Zoom Out
       locate:
         title: Show My Location
-        metersUnit: meters
-        feetUnit: feet
-        popup: You are within {distance} {unit} of this point
+        metersPopup:
+          one: You are within one meter of this point
+          other: You are within %{count} meters of this point
+        feetPopup:
+          one: You are within one foot of this point
+          other: You are within %{count} feet of this point
       base:
         standard: Standard
         cycle_map: Cycle Map
         transport_map: Transport Map
         hot: Humanitarian
+        opnvkarte: ÖPNVKarte
       layers:
         header: Map Layers
         notes: Map Notes
@@ -2491,6 +2513,9 @@ en:
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
+      thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
+      opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
+      hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map