Rename a number of methods in the map_bugs controller

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e57bbd050d944eb645779cc74b3e93a0e49d9e87..a8f523b472bbe32f5c9e01184389cfabcb0e6102 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -141,6 +141,8 @@ en:
     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"
+      deleted_at: "Deleted at:"
+      deleted_by: "Deleted by:"
       version: "Version:"
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"
@@ -1071,7 +1073,7 @@ en:
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).</li>
           <li><strong>France</strong>: Contains data sourced from
-          Direction Générale des Impôts.</i>
+          Direction Générale des Impôts.</li>
           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
           <li><strong>Poland</strong>: Contains data from <a
@@ -1176,6 +1178,13 @@ en:
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
+    map_bug_plain:
+      subject_own: "[OpenStreetMap bugs] {{commenter}} has commented on one of your bugs"
+      subject_other: "[OpenStreetMap bugs] {{commenter}} has commented on a bug you are interested in"
+      greeting: "Hi,"
+      your_bug: "{{commenter}} has left a comment on one of your map bug reports near {{place}}."
+      commented_bug: "{{commenter}} has left a comment on a map bug report you have commented on. The bug is near {{place}}."
+      details: "More details about the bug report can be found at {{URL}}."
   message:
     inbox:
       title: "Inbox"
@@ -1389,10 +1398,9 @@ en:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
-      your_traces: "See just your traces"
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
+      see_your_traces: "See your traces"
       traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     trace_optionals:
       tags: "Tags"
@@ -1906,10 +1914,13 @@ en:
       Mark as fixed: Mark as fixed
       Cancel: Cancel
       Create OpenStreetBug: Create OpenStreetBug
-      Create bug: Create bug
-      Bug description: Bug description
-      Create: Create
+      Create bug: Report a problem with the map
+      Bug description: Problem description
+      Create: Report problem
       Permalink: Permalink
       Login: Login
       Details: Details
+      edityourself: You can also edit the map directly your self
+      draghelp1: Please drag the marker to the location of the problem
+      draghelp2: and descripe it as accurate as possible