X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/180228b7e36224fefd5540306d7fb77799d4b827..a99b5169626d3369886c471e846020fbff301dbc:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5d42f3c5d..4fbe1b20b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -933,7 +933,6 @@ en:
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    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
@@ -1062,7 +1061,7 @@ 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"
+      subject_header: "[OpenStreetMap] {{subject}}"
       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}}"
@@ -1352,7 +1351,8 @@ en:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
+      your_traces: "See just your traces"
+      upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
       see_your_traces: "See all your traces"
       traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
@@ -1534,10 +1534,12 @@ en:
       confirm password: "Confirm Password:"
       continue: Continue
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      terms accepted: "Thanks for accepting the new contributor terms!"
     terms:
+      title: "Contributor 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"
+      read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of the agreement."
+      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
@@ -1622,6 +1624,14 @@ en:
       public editing note:
         heading: "Public editing"
         text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"http://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+      contributor terms:
+        heading: "Contributor Terms:"
+        agreed: "You have agreed to the new Contributor Terms."
+        not yet agreed: "You have not yet agreed to the new Contributor Terms."
+        review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
+        agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
+        link: "http://www.osmfoundation.org/wiki/License/Contributor_Terms"
+        link text: "what is this?"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
       image: "Image:"