From: Tom Hughes <tom@compton.nu>
Date: Thu, 22 Apr 2010 10:13:14 +0000 (+0100)
Subject: Merge branch 'copyright'
X-Git-Tag: live~7412^2~4
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/8197ab3f82f343dd305b817e7676647354d0aea5?ds=inline;hp=-c

Merge branch 'copyright'
---

8197ab3f82f343dd305b817e7676647354d0aea5
diff --combined config/locales/en.yml
index eb5173217,7e10cdf61..fb2f6c48b
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -233,10 -233,6 +233,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:"
@@@ -918,6 -914,7 +918,7 @@@
      help_wiki: "Help &amp; Wiki"
      help_wiki_tooltip: "Help &amp; Wiki site for the project"
      help_wiki_url: "http://wiki.openstreetmap.org"
+     copyright: "Copyright &amp; License"
      news_blog: "News blog"
      news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
      shop: Shop