X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b68b29b43c2e385af05d81815e347c2ab22ed269..49050467cc2fec02cabd68883a297815547e59a2:/config/locales/en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 622d912ce..edac3808b 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -145,7 +145,7 @@ en-GB:
         title_comment: Changeset %{id} - %{comment}
       join_discussion: Log in to join the discussion
       discussion: Discussion
-      report: Report this changeset
+      report: Report this changeset?
     node:
       title: 'Node: %{name}'
       history_title: 'Node History: %{name}'
@@ -227,6 +227,7 @@ en-GB:
       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.
@@ -318,10 +319,12 @@ en-GB:
       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
@@ -941,10 +944,10 @@ en-GB:
     resolve: Resolve
     ignore: Ignore
     reopen: Reopen
-    index:
+    index:      
       search:
         user_not_found: User does not exist
-        issues_not_found: No Issues against the user
+        issues_not_found: No such issues found
     create:
       successful_report: Your report has been registered sucessfully
       provide_details: Please provide the required details
@@ -954,6 +957,12 @@ en-GB:
       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: Before sending in a report for official action, be sure that
+        placeholder1: You are sure that the problem is not just a mistake
+        placeholder2: You are unable to fix the problem yourself
+        placeholder3: You have tried to resolve the problem with the user
     show:
       comments:
         reassign: The Issue was reassigned
@@ -1008,18 +1017,40 @@ en-GB:
           type: "[OTHER]"
           details: Other  
       Changeset:
-        type1:
-          type: "[TYPE1]"
-          details: Placeholder 1    
-        type2:
-          type: "[TYPE1]"
-          details: Placeholder 2    
-        type3:
-          type: "[TYPE3]"
-          details: Placeholder 3    
+        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  
+          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:
       title: OpenStreetMap
@@ -1036,7 +1067,7 @@ en-GB:
     edit: Edit
     history: History
     export: Export
-    issues: Issues
+    reports: Reports
     data: Data
     export_data: Export Data
     gps_traces: GPS Traces
@@ -1439,6 +1470,7 @@ en-GB:
       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
@@ -2058,7 +2090,7 @@ en-GB:
       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