X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ce310b38c346c67a2d1af08142c36ba11d11ed5..63992d83bdf3c2489e10504957bb57ed29976803:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 70a16bce0..7c127ffc7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -131,6 +131,7 @@ en:
         title_comment: "Changeset %{id} - %{comment}"
       join_discussion: "Log in to join the discussion"
       discussion: Discussion
+      report: Report this changeset?
     node:
       title: "Node: %{name}"
       history_title: "Node History: %{name}"
@@ -206,6 +207,7 @@ 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>"
+      report: Report this note?
     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."
@@ -296,10 +298,12 @@ en:
       edit_link: Edit this entry
       hide_link: Hide this entry
       confirm: Confirm
+      report: Report this entry?
     diary_comment:
       comment_from: "Comment from %{link_user} on %{comment_created_at}"
       hide_link: Hide this comment
       confirm: Confirm
+      report: Report this comment?
     location:
       location: "Location:"
       view: "View"
@@ -367,7 +371,6 @@ en:
     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>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
@@ -904,6 +907,70 @@ en:
     results:
       no_results: "No results found"
       more_results: "More results"
+  issues:
+    report: Report
+    resolve: Resolve
+    ignore: Ignore
+    reopen: Reopen
+    index:
+      search:
+        user_not_found: User does not exist
+        issues_not_found: No such issues found
+    create:
+      successful_report: Your report has been registered sucessfully
+      provide_details: Please provide the required details
+    update:
+      new_report: Your report been registered sucessfully
+      successful_update: Your report has been updated successfully
+      provide_details: Please provide the required details
+    new:
+      details: Please provide some more details into the problem. (This field cannot be left blank!)
+      select: Select a reason for your report
+      disclaimer:
+        intro: Before sending in a report for official action, be sure that
+        not_just_mistake: You are sure that the problem is not just a mistake
+        unable_to_fix: You are unable to fix the problem yourself
+        resolve_with_user: You have tried to resolve the problem with the user
+    show:
+      comments:
+        reassign_param: Reassign Issue?
+    comment:
+      provide_details: Please provide the required details
+      comment_created: Your comment was successfully created
+    resolved: Issue status has been set to 'Resolved'
+    ignored: Issue status has been set to 'Ignored'
+    reopened: Issue status has been set to 'Open'
+  reports:
+    categories:
+      DiaryEntry:
+        spam: This Diary Entry is/contains spam
+        offensive: This Diary Entry is obscene/offensive
+        threat: This Diary Entry contains a threat
+        other: Other
+      DiaryComment:
+        spam: This Diary Comment is/contains spam
+        offensive: This Diary Comment is obscene/offensive
+        threat: This Diary Comment contains a threat
+        other: Other
+      User:
+        spam: This User profile is/contains spam
+        offensive: This User profile is obscene/offensive
+        threat: This User profile contains a threat
+        vandal: This User is a vandal
+        other: Other
+      Changeset:
+        undiscussed_import: This changeset is an undiscussed import
+        mechanical_edit: This changeset is a mechanical edit
+        edit_error: This changeset contains a newbie or an editor error
+        spam: This changeset is/contains spam
+        vandalism: This changeset is/contains vandalism
+        other: Other
+      Note:
+        spam: This note is spam
+        vandalism: This note is vandalism
+        personal: This note contains personal data
+        abusive: This note is abusive
+        other: Other
   layouts:
     project_name:
       # in <title>
@@ -922,6 +989,7 @@ en:
     edit: Edit
     history: History
     export: Export
+    issues: Issues
     data: Data
     export_data: Export Data
     gps_traces: GPS Traces
@@ -933,7 +1001,7 @@ en:
     intro_header: Welcome to OpenStreetMap!
     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}, %{bytemark} and %{ic}, and other %{partners}."
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
     partners_ucl: "UCL"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
@@ -1006,9 +1074,7 @@ en:
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a
-        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-        FAQ</a>.
+        href="http://osmfoundation.org/Licence">OSMF Licence page</a>.
       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-parties.
@@ -1116,8 +1182,8 @@ en:
       paragraph_1_html: |
         OpenStreetMap has few formal rules but we expect all participants to collaborate
         with, and communicate with, the community. If you are considering
-        any activities other than editing by hand, please read and follow the guidelines on 
-        <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
+        any activities other than editing by hand, please read and follow the guidelines on
+        <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
         <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
     questions:
       title: Any questions?
@@ -1143,7 +1209,7 @@ en:
         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. 
+          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.
@@ -1153,8 +1219,8 @@ en:
       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>.  
+        <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: |
@@ -1210,7 +1276,9 @@ en:
       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>,
+      To learn more about the community, see the
+      <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
+      <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
@@ -1222,13 +1290,13 @@ en:
       License page</a> for details.
     legal_title: Legal
     legal_html: |
-      This site and many other related services are formally operated by the  
-      <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
-      on behalf of the community. Use of all OSMF operated services is subject 
+      This site and many other related services are formally operated by the
+      <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+      on behalf of the community. Use of all OSMF operated services is subject
       to our <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
       Acceptable Use Policies</a> and our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
-      <br> 
-      Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a> 
+      <br>
+      Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a>
       if you have licensing, copyright or other legal questions and issues.
     partners_title: Partners
   notifier:
@@ -1320,6 +1388,11 @@ en:
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
       unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+    new_issue_notification:
+      subject: "[OpenStreetMap] New Issue"
+      greeting: "Hi,"
+      new_issue: "A new issue has been created"
+      url: You can view the issue here
   message:
     inbox:
       title: "Inbox"
@@ -1377,6 +1450,7 @@ en:
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
+      delete_button: "Delete"
       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
@@ -1421,7 +1495,7 @@ en:
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
-      where_am_i: "Where am I?"
+      where_am_i: "Where is this?"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
     key:
@@ -1623,6 +1697,8 @@ en:
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
+    require_admin:
+      not_an_admin: You need to be an admin to perform that action.
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:
@@ -1894,6 +1970,7 @@ en:
       friends_diaries: "friends' diary entries"
       nearby_changesets: "nearby user changesets"
       nearby_diaries: "nearby user diary entries"
+      report: "Report this user?"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
@@ -2253,6 +2330,7 @@ en:
       ascend: "Ascend"
       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
+        graphhopper_car: "Car (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
         mapquest_bicycle: "Bicycle (MapQuest)"
         mapquest_car: "Car (MapQuest)"