Localisation updates from http://translatewiki.net

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a2ac4eafdf11de9665826364dab1736e3ad05a81..12fa1562773d9e5ef1f5e1efe7bca7ca506cc69a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -933,7 +933,7 @@ en:
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise

-    sotm: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!'
+    sotm2010: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!'

     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License


@@ -1537,7 +1537,7 @@ en:
     terms:
       heading: "Contributor terms"
       press accept button: "Please read the agreement below and press the agree button to create your account."
     terms:
       heading: "Contributor terms"
       press accept button: "Please read the agreement below and press the agree button to create your account."

-      consider_pd: "I consider my contributions to be in the Public Domain"
+      consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"

       consider_pd_why: "what's this?"
       consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain
       agree: Agree
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain
       agree: Agree