Merge branch 'master' into openstreetbugs

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2e57df0e5d25800aac45d7bf1599d5490b9a79f5..98a50ffd2a67fe3553f8e3807bf6f7a07524c947 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -944,7 +944,7 @@ en:
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+    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
@@ -1073,7 +1073,6 @@ en:
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
     message_notification:
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
       hi: "Hi {{to_user}},"
       header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
       footer1: "You can also read the message at {{readurl}}"
@@ -1548,7 +1547,7 @@ en:
     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