Merge branch 'master' into openstreetbugs

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 667a6faeb76e6a1a659c92eaac170e14ec036b20..53dc9539eabbeefb1d453bd6c814a4ecd3220d4d 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
@@ -1183,7 +1185,6 @@ en:
       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"
@@ -1914,10 +1915,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