Merge branch 'master' into openstreetbugs

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c0e7d26e4d9d52485dce0fc2e37c6554a08a0ce3..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