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 dd8815329bd2925ed38ba73f1decf8cb720cf827..5e7f2527761baed391922b0e127b60b4f2a30e28 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -929,10 +929,10 @@ en:
       details: Please provide some more details into the problem. (This field cannot be left blank!)
       select: Select a reason for your report
       disclaimer:
       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      
+        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


@@ -1438,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"