Merge -r 20198:20540 from trunc into openstreetbugs branch

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8699d600cf0420e5775fe87f17c2d6356b291ed9..9795528192bfb1e7c1a7b714855321c71cdd72bd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -252,6 +252,17 @@ en:
       download_xml: "Download XML"
       view_history: "view history"
       edit: "edit"
+    bug:
+      open_title: "Unresolved issue: {{bug_name}}"
+      closed_title: "Resolved issue: {{bug_name}}"
+      created_at: "Created at:"
+      edited_at: "Edited at:"
+      closed_at: "Closed at:"
+      opened_by: "Opened by:"
+      description: "Description:"
+      comment_by: "Comment by: "
+      comment: "Comment:"
+      date: "Date:"
   changeset:
     changeset_paging_nav: 
       showing_page: "Showing page {{page}}"
@@ -1624,6 +1635,19 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
+  bugs:
+    rss:
+      description: "A list of bugs, reported, commented on or closed in your area"
+      closed: "closed bug (near {{place}})"
+      new: "new bug (near {{place}})"
+      comment: "new comment (near {{place}})"
+    user:
+      title_user: "Bugs submitted or commented on by {{user}}"
+      heading_user: "{{user}}'s bugs"
+      description_user: "Bugs submitted or commented on by {{user}}"
+      id: "Id"
+      last_changed: "Last changed"
+
   javascripts:
     map:
       base: