UI changes + Redirection after creating report fixed

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 517f3a866f41d69325216c4e88284546298f1f69..a4a0af3298d41b1595fe4c8c371f2e87ea7061fb 100644 (file)
--- 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"
@@ -910,6 +914,10 @@ en:
     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
@@ -919,15 +927,100 @@ en:
       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:
+        placeholder: Please make sure you have done the below before submitting a report
+        placeholder1: Placeholder 1 
+        placeholder2: Placeholder 2
+        placeholder3: Placeholder 3      
+    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:
-      spam: is/contains spam
-      offensive: is obscene/offensive
-      threat: contains a threat
-      vandal: is a vandal
-      other: Other
+      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:
+        undiscussed_import:
+          type: "[UNDISCUSSED-IMPORT]"
+          details: This changeset is an undiscussed import    
+        mechanical_edit:
+          type: "[MECH-EDIT]"
+          details: This changeset is a mechanical edit    
+        edit_error:
+          type: "[EDIT-ERROR]"
+          details: This changeset contains a newbie or an editor error    
+        spam:
+          type: "[SPAM]"
+          details: This changeset is/contains spam  
+        vandalism:
+          type: "[VANDALISM]"
+          details: This changeset is/contains vandalism  
+        other: 
+          type: "[OTHER]"
+          details: Other
+      Note:
+        spam:
+          type: "[SPAM]"
+          details: This note is spam            
+        vandalism:
+          type: "[VANDALISM]"
+          details: This note is vandalism            
+        personal:
+          type: "[PERSONAL]"
+          details: This note contains personal data            
+        abusive:
+          type: "[ABUSIVE]"
+          details: This note is abusive
+        other:
+          type: "[OTHER]"
+          details: Other            
   layouts:
     project_name:
       # in <title>
@@ -946,7 +1039,7 @@ en:
     edit: Edit
     history: History
     export: Export
-    issues: Issues
+    reports: Reports
     data: Data
     export_data: Export Data
     gps_traces: GPS Traces
@@ -1345,6 +1438,7 @@ en:
       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"
@@ -1915,7 +2009,7 @@ en:
       friends_diaries: "friends' diary entries"
       nearby_changesets: "nearby user changesets"
       nearby_diaries: "nearby user diary entries"
-      report: "Report User"
+      report: "Report this user?"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"