Make the link from site#help to site#welcome use a relative URL

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6c147dbcb6e38cc7a0c5f8795300643aae3399e7..7ee23f2f879f4d44c7a3fbee6c55060b69009280 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>"
@@ -1086,7 +1074,7 @@ en:
       OpenStreetMap has several resources for learning about the project, asking and answering questions,
       and collaboratively discussing and documenting mapping topics.
     welcome:
-      url: http://www.openstreetmap.org/welcome
+      url: /welcome
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
     help:
@@ -2062,6 +2050,8 @@ en:
       edit_disabled_tooltip: Zoom in to edit the map
       createnote_tooltip: Add a note to the map
       createnote_disabled_tooltip: Zoom in to add a note to the map
+      map_notes_zoom_in_tooltip: Zoom in to see map notes
+      map_data_zoom_in_tooltip: Zoom in to see map data
     notes:
       new:
         intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."