X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/311acad0c43401fe3d7651d021154af2efbedff5..b68b29b43c2e385af05d81815e347c2ab22ed269:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1cfbf8ab1..6e5a08b24 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}"
@@ -905,6 +906,90 @@ 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 Issues against the user    
+    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!)
+    show: 
+      comments:
+        reassign: The Issue was reassigned
+        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'
+    report_strings:
+      DiaryEntry:
+        spam: 
+          type: "[SPAM]"
+          details: This Diary Entry is/contains spam
+        offensive: 
+          type: "[OFFENSIVE]"
+          details: This Diary Entry is obscene/offensive
+        threat: 
+          type: "[THREAT]"
+          details: This Diary Entry contains a threat
+        other: 
+          type: "[OTHER]"
+          details: Other
+      DiaryComment:
+        spam: 
+          type: "[SPAM]"
+          details: This Diary Comment is/contains spam
+        offensive: 
+          type: "[OFFENSIVE]"
+          details: This Diary Comment is obscene/offensive
+        threat: 
+          type: "[THREAT]"
+          details: This Diary Comment contains a threat
+        other: 
+          type: "[OTHER]"
+          details: Other
+      User:
+        spam: 
+          type: "[SPAM]"
+          details: This User profile is/contains spam
+        offensive: 
+          type: "[OFFENSIVE]"
+          details: This User profile is obscene/offensive
+        threat: 
+          type: "[THREAT]"
+          details: This User profile contains a threat
+        vandal:
+          type: "[VANDAL]"
+          details: This User is a vandal
+        other: 
+          type: "[OTHER]"
+          details: Other      
+      Changeset:
+        type1:
+          type: "[TYPE1]"
+          details: Placeholder 1    
+        type2:
+          type: "[TYPE1]"
+          details: Placeholder 2    
+        type3:
+          type: "[TYPE3]"
+          details: Placeholder 3    
+        other: 
+          type: "[OTHER]"
+          details: Other            
   layouts:
     project_name:
       # in <title>
@@ -923,6 +1008,7 @@ en:
     edit: Edit
     history: History
     export: Export
+    issues: Issues
     data: Data
     export_data: Export Data
     gps_traces: GPS Traces
@@ -1317,6 +1403,10 @@ en:
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
+    new_issue_notification:
+      subject: "[OpenStreetMap] New Issue"
+      greeting: "Hi,"
+      new_issue: "A new issue has been created"
   message:
     inbox:
       title: "Inbox"
@@ -1433,6 +1523,9 @@ en:
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
+          cycleway_national: "National cycleway"
+          cycleway_regional: "Regional cycleway"
+          cycleway_local: "Local cycleway"
           footway: "Footway"
           rail: "Railway"
           subway: "Subway"
@@ -1485,6 +1578,9 @@ en:
           private: "Private access"
           destination: "Destination access"
           construction: "Roads under construction"
+          bicycle_shop: "Bicycle shop"
+          bicycle_parking: "Bicycle parking"
+          toilets: "Toilets"
     richtext_area:
       edit: Edit
       preview: Preview
@@ -1614,6 +1710,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:
@@ -1879,6 +1977,7 @@ en:
       friends_diaries: "friends' diary entries"
       nearby_changesets: "nearby user changesets"
       nearby_diaries: "nearby user diary entries"
+      report: "Report User"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
@@ -1919,6 +2018,8 @@ en:
         gravatar: "Use Gravatar"
         link: "http://wiki.openstreetmap.org/wiki/Gravatar"
         link text: "what is this?"
+        disabled: "Gravatar has been disabled."
+        enabled: "Display of your Gravatar has been enabled."
       new image: "Add an image"
       keep image: "Keep the current image"
       delete image: "Remove the current image"