Add a banner for SOTM US

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 631917a37591e8d48749e2d7920841cda6f6c44c..3788abe9f52194fd44848b925b8fe076a7606d0c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1003,6 +1003,7 @@ en:
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
+    sotm2012: 'Come to the 2012 United States OpenStreetMap Conference, The State of the Map US, October 13-14th in Portland, Oregon!'
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
@@ -1103,7 +1104,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
@@ -1280,10 +1281,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:
@@ -1589,8 +1588,6 @@ en:
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."
-      notice: "<a href=\"http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License\">Find out more about OpenStreetMap's upcoming license change</a> (<a href=\"http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License\">translations</a>) (<a href=\"http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming\">discussion</a>)"
-      notice_terms: "OpenStreetMap is moving to a new licence on 1st April 2012. It's just as open as our current one, but the legal bits are much better suited to our map database. We'd love to keep your contributions in OpenStreetMap, but we can only do so if you agree to let us distribute them under the new licence. Otherwise, we'll have to remove them from the database.<br /><br />Please log in, then take a few seconds to review and accept the new terms. Thank you!"
       openid missing provider: "Sorry, could not contact your OpenID provider"
       openid invalid: "Sorry, your OpenID seems to be malformed"
       openid_logo_alt: "Log in with an OpenID"