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 ac4b97b8229cdf638a276c9650a04ba6b05415f9..5e7f2527761baed391922b0e127b60b4f2a30e28 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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>"
       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."
     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."


@@ -916,7 +917,7 @@ en:
     index:
       search:
         user_not_found: User does not exist
     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
     create:
       successful_report: Your report has been registered sucessfully
       provide_details: Please provide the required details


@@ -927,6 +928,11 @@ en:
     new:
       details: Please provide some more details into the problem. (This field cannot be left blank!)
       select: Select a reason for your report
     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
     show: 
       comments:
         reassign: The Issue was reassigned


@@ -1432,6 +1438,7 @@ en:
       subject: "[OpenStreetMap] New Issue"
       greeting: "Hi,"
       new_issue: "A new issue has been created"
       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"
   message:
     inbox:
       title: "Inbox"