Merge branch 'master' into terms

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 21931925a5f6a367d04133817bfd33b6a94751cc..ff764c77992bd15b89b326859d7eca6f6a5f8164 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -89,7 +89,7 @@ en:
       feed:
         title: "Changeset {{id}}"
         title_comment: "Changeset {{id}} - {{comment}}"
-    changeset_navigation:
+    navigation:
       paging:
         user:
           prev: "« {{id}}"
@@ -98,12 +98,18 @@ en:
           prev: "« {{id}}"
           next: "{{id}} »"
       user:
-        name_tooltip: "View edits by {{user}}"
-        prev_tooltip: "Previous edit by {{user}}"
-        next_tooltip: "Next edit by {{user}}"
+        name_changeset_tooltip: "View edits by {{user}}"
+        prev_changeset_tooltip: "Previous edit by {{user}}"
+        next_changeset_tooltip: "Next edit by {{user}}"
       all:
-        prev_tooltip: "Previous changeset"
-        next_tooltip: "Next changeset"
+        prev_node_tooltip: "Previous node"
+        next_node_tooltip: "Next node"
+        prev_way_tooltip: "Previous way"
+        next_way_tooltip: "Next way"
+        prev_relation_tooltip: "Previous relation"
+        next_relation_tooltip: "Next relation"
+        prev_changeset_tooltip: "Previous changeset"
+        next_changeset_tooltip: "Next changeset"
     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"
@@ -233,6 +239,10 @@ en:
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"
+      wiki_link:
+        key: "The wiki description page for the {{key}} tag"
+        tag: "The wiki description page for the {{key}}={{value}} tag"
+      wikipedia_link: "The {{page}} article on Wikipedia"
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
@@ -914,6 +924,7 @@ en:
     help_wiki: "Help & Wiki"
     help_wiki_tooltip: "Help & Wiki site for the project"
     help_wiki_url: "http://wiki.openstreetmap.org"
+    copyright: "Copyright & License"
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     shop: Shop