Border between history entries

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6c147dbcb6e38cc7a0c5f8795300643aae3399e7..ffaefd1471ed47b69a330277a736c4ed54203af8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -96,21 +96,23 @@ en:
       description: "Remote Control (JOSM or Merkaartor)"
   browse:
     created: "Created"
-    edited: "Edited"
     closed: "Closed"
-    deleted: "Deleted"
-    by: "by"
-    ago: "%{ago} ago"
+    created_html: "Created <abbr title='%{title}'>%{time} ago</abbr>"
+    closed_html: "Closed <abbr title='%{title}'>%{time} ago</abbr>"
+    created_by_html: "Created <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    deleted_by_html: "Deleted <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    edited_by_html: "Edited <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    closed_by_html: "Closed <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
     version: "Version"
     in_changeset: "Changeset"
+    anonymous: "anonymous"
     no_comment: "(no comment)"
     part_of: "Part of"
     download_xml: "Download XML"
-    view_history: "View history"
-    view_details: "View details"
+    view_history: "View History"
+    view_details: "View Details"
     changeset:
-      title: "Changeset"
-      changeset: "Changeset %{id}"
+      title: "Changeset %{id}"
       belongs_to: "Author"
       node: "Nodes (%{count})"
       node_paginated: "Nodes (%{x}-%{y} of %{count})"
@@ -124,24 +126,18 @@ en:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"
     node:
-      node: "Node"
-      node_title: "Node: %{node_name}"
-      node_history: "Node History"
-      node_history_title: "Node History: %{node_name}"
+      title: "Node: %{name}"
+      history_title: "Node History: %{name}"
     way:
-      way: "Way"
-      way_title: "Way: %{way_name}"
-      way_history: "Way History"
-      way_history_title: "Way History: %{way_name}"
+      title: "Way: %{name}"
+      history_title: "Way History: %{name}"
       nodes: "Nodes"
       also_part_of:
         one: "part of way %{related_ways}"
         other: "part of ways %{related_ways}"
     relation:
-      relation: "Relation"
-      relation_title: "Relation: %{relation_name}"
-      relation_history: "Relation History"
-      relation_history_title: "Relation History: %{relation_name}"
+      title: "Relation: %{name}"
+      history_title: "Relation History: %{name}"
       members: "Members"
     relation_member:
       entry: "%{type} %{name}"
@@ -190,14 +186,6 @@ en:
       new_note: "New Note"
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
-      opened: "Opened"
-      last_modified: "Last modified"
-      closed: "Closed"
-      at_html: "%{when} ago"
-      at_by_html: "%{when} ago by %{user}"
-      description: "Description"
-      comments: "Comments"
-      anonymous: "anonymous"
       open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
       open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
       commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"