fix build on wily; fix some moderation branch language constants

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6e5a08b24f849a51575c97d10771a125b4969301..5e7f2527761baed391922b0e127b60b4f2a30e28 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -131,7 +131,7 @@ en:
         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}"
@@ -207,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."
@@ -297,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"
@@ -914,7 +917,7 @@ en:
     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
@@ -924,6 +927,12 @@ 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:
+        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: The Issue was reassigned
@@ -978,16 +987,38 @@ en:
           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
+      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:
@@ -1008,7 +1039,7 @@ en:
     edit: Edit
     history: History
     export: Export
-    issues: Issues
+    reports: Reports
     data: Data
     export_data: Export Data
     gps_traces: GPS Traces
@@ -1407,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"
@@ -1977,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"