Merge branch 'master' into openstreetbugs

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 598301c2a0c8d8cac0cbdc0acafb5083fb12142b..63b15233fac80936f728c4220bf7c3527d768ac6 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -121,6 +121,8 @@ en:
         next_relation_tooltip: "Next relation"
         prev_changeset_tooltip: "Previous changeset"
         next_changeset_tooltip: "Next changeset"
+        prev_note_tooltip: "Previous note"
+        next_note_tooltip: "Next note"
     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"
@@ -285,14 +287,12 @@ en:
     note:
       open_title: "Unresolved issue: %{note_name}"
       closed_title: "Resolved issue: %{note_name}"
-      created_at: "Created at:"
-      edited_at: "Edited at:"
-      closed_at: "Closed at:"
-      opened_by: "Opened by:"
+      opened: "Opened:"
+      last_modified: "Last modified:"
+      closed: "Closed:"
+      at_by: "%{when} ago by %{user}"
       description: "Description:"
-      comment_by: "Comment by: "
-      comment: "Comment:"
-      date: "Date:"
+      comments: "Comments:"
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"
@@ -1922,6 +1922,11 @@ en:
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
   note:
+    description:
+      opened_at_by: "Created %{when} ago by %{user}"
+      commented_at_by: "Updated %{when} ago by %{user}"
+      closed_at_by: "Resolved %{when} ago by %{user}"
+      reopened_at_by: "Reactivated %{when} ago by %{user}"
     rss:
       title: "OpenStreetMap Notes"
       description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
@@ -1935,7 +1940,6 @@ en:
       description: "Notes submitted or commented on by %{user}"
       id: "Id"
       last_changed: "Last changed"
-
   javascripts:
     map:
       base:
@@ -1952,25 +1956,23 @@ en:
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
       history_zoom_alert: You must zoom in to view edits for this area
-    osb:
-      Fixed Error: Fixed Error
-      Unresolved Error: Unresolved Error
-      Description: Description
-      Comment: Comment
-      Has been fixed: This error has been fixed already. However, it might take a couple of days before the map image is updated.
-      Comment/Close: Comment/Close
-      Nickname: Nickname
-      Add comment: Add comment
-      Mark as fixed: Mark as fixed
-      Cancel: Cancel
-      Create OpenStreetBug: Create OpenStreetBug
-      Create bug: Report a problem with the map
-      Bug description: Problem description
-      Create: Report problem
-      Permalink: Permalink
-      Login: Login
-      Details: Details
+    note:
+      closed: Closed Note
+      open: Open Note
+      details: Details
+      permalink: Permalink
+      description: Description
+      comment: Comment
+      render_warning: This error has been fixed already. However, it might take a couple of days before the map image is updated.
+      update: Update
+      nickname: Nickname
+      login: Login
+      add_comment: Add Comment
+      close: Close
+      cancel: Cancel
+      create: Create Note
+      create_title: Report a problem with the map
+      create_help1: Please drag the marker to the location of the problem
+      create_help2: and descripe it as accurate as possible
+      report: Report Problem
       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
-