Fix interpolation issues in attribution text

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65ad5123375dc81a06f6f9d3107be3bfb758ddbc..f2b76f94a7ec28a6354d8dab9dc92b35c415c3c2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1003,9 +1003,6 @@ en:
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
-    license:
-      alt: CC BY-SA 2.0
-      title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
@@ -1106,7 +1103,7 @@ en:
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
         accepts any liability.
-      infringement_title_html: Finding out more
+      infringement_title_html: Copyright infringement
       infringement_1_html: |
         OSM contributors are reminded never to add data from any
         copyrighted sources (e.g. Google Maps or printed maps) without
@@ -1283,10 +1280,8 @@ en:
       permalink: Permalink
       shortlink: Shortlink
       license:
-        notice: "Licensed under the %{license_name} license by the %{project_name} and its contributors."
-        license_name: "Open Data Commons Open Database License (ODbL)"
-        license_url: "http://opendatacommons.org/licenses/odbl/1.0/"
-        project_name: "OpenStreetMap project"
+        copyright: "Copyright OpenStreetMap and contributors, under an open license"
+        license_url: "http://openstreetmap.org/copyright"
         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit: