Merge branch 'master' into openid

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8a8d3cdaa2e0c7fba147f3d7dac2a681a35b07dd..7625a695f29274a1adf48760d3f0d995c38f22bf 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,7 +3,7 @@ en:
     dir: ltr
   time:
     formats:
     dir: ltr
   time:
     formats:

-      friendly: "%e %B %Y at %H:%M"    
+      friendly: "%e %B %Y at %H:%M"

   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:


@@ -127,7 +127,7 @@ en:
       has_relations:
         one:  "Has the following {{count}} relation:"
         other: "Has the following {{count}} relations:"
       has_relations:
         one:  "Has the following {{count}} relation:"
         other: "Has the following {{count}} relations:"

-    common_details: 
+    common_details:

       edited_at: "Edited at:"
       edited_by: "Edited by:"
       version: "Version:"
       edited_at: "Edited at:"
       edited_by: "Edited by:"
       version: "Version:"


@@ -263,7 +263,7 @@ en:
       view_history: "view history"
       edit: "edit"
   changeset:
       view_history: "view history"
       edit: "edit"
   changeset:

-    changeset_paging_nav: 
+    changeset_paging_nav:

       showing_page: "Showing page {{page}}"
       next: "Next »"
       previous: "« Previous"
       showing_page: "Showing page {{page}}"
       next: "Next »"
       previous: "« Previous"


@@ -297,6 +297,8 @@ en:
       description_user: "Changesets by {{user}}"
       description_bbox: "Changesets within {{bbox}}"
       description_user_bbox: "Changesets by {{user}} within {{bbox}}"
       description_user: "Changesets by {{user}}"
       description_bbox: "Changesets within {{bbox}}"
       description_user_bbox: "Changesets by {{user}} within {{bbox}}"

+    timeout:
+      sorry: "Sorry, the list of changesets you requested took too long to retrieve."

   diary_entry:
     new:
       title: New Diary Entry
   diary_entry:
     new:
       title: New Diary Entry


@@ -414,6 +416,7 @@ en:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:

+      prefix_format: "{{name}}"

       prefix:
         amenity:
           airport: "Airport"
       prefix:
         amenity:
           airport: "Airport"


@@ -921,16 +924,19 @@ en:
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating

-    help_wiki: "Help & Wiki"
-    help_wiki_tooltip: "Help & Wiki site for the project"
-    help_wiki_url: "http://wiki.openstreetmap.org"
+    help_and_wiki: "{{help}} & {{wiki}}"
+    help: Help
+    help_url: http://help.openstreetmap.org/
+    help_title: Help site for the project
+    wiki: Wiki
+    wiki_url: http://wiki.openstreetmap.org/
+    wiki_title: Wiki site for the project

     copyright: "Copyright & License"
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     copyright: "Copyright & License"
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     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!'

     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


@@ -941,30 +947,20 @@ en:
   license_page:
     foreign:
       title: About this translation
   license_page:
     foreign:
       title: About this translation

-      text: |
-        In the event of a conflict between this translated page and
-        {{english_original_link}}, the English page shall take
-        precedence
+      text: In the event of a conflict between this translated page and {{english_original_link}}, the English page shall take precedence

       english_link: the English original
     native:
       title: About this page
       english_link: the English original
     native:
       title: About this page

-      text: |
-
-        You are viewing the English version of the copyright page. You
-        can go back to the {{native_link}} of this page; Or you can
-        stop reading about copyright and {{mapping_link}}.
-
+      text: You are viewing the English version of the copyright page. You can go back to the {{native_link}} of this page or you can stop reading about copyright and {{mapping_link}}.

       native_link: THIS_LANGUAGE_NAME_HERE version
       mapping_link: start mapping
     legal_babble: |
       <h2>Copyright and License</h2>
       native_link: THIS_LANGUAGE_NAME_HERE version
       mapping_link: start mapping
     legal_babble: |
       <h2>Copyright and License</h2>

-      

       <p>
          OpenStreetMap is <i>open data</i>, licensed under the <a
          href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
          Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).
       </p>
       <p>
          OpenStreetMap is <i>open data</i>, licensed under the <a
          href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
          Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).
       </p>

-      

       <p>
         You are free to copy, distribute, transmit and adapt our maps
         and data, as long as you credit OpenStreetMap and its
       <p>
         You are free to copy, distribute, transmit and adapt our maps
         and data, as long as you credit OpenStreetMap and its


@@ -974,9 +970,8 @@ en:
         href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
         code</a> explains your rights and responsibilities.
       </p>
         href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
         code</a> explains your rights and responsibilities.
       </p>

-      
+

       <h3>How to credit OpenStreetMap</h3>
       <h3>How to credit OpenStreetMap</h3>

-      

       <p>
         If you are using OpenStreetMap map images, we request that
         your credit reads at least &ldquo;&copy; OpenStreetMap
       <p>
         If you are using OpenStreetMap map images, we request that
         your credit reads at least &ldquo;&copy; OpenStreetMap


@@ -984,7 +979,6 @@ en:
         we request &ldquo;Map data &copy; OpenStreetMap contributors,
         CC-BY-SA&rdquo;.
       </p>
         we request &ldquo;Map data &copy; OpenStreetMap contributors,
         CC-BY-SA&rdquo;.
       </p>

-      

       <p>
         Where possible, OpenStreetMap should be hyperlinked to <a
         href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
       <p>
         Where possible, OpenStreetMap should be hyperlinked to <a
         href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>


@@ -996,32 +990,28 @@ en:
         &lsquo;OpenStreetMap&rsquo; to this full address) and to
         www.creativecommons.org.
       </p>
         &lsquo;OpenStreetMap&rsquo; to this full address) and to
         www.creativecommons.org.
       </p>

-      
+

       <h3>Finding out more</h3>
       <h3>Finding out more</h3>

-      

       <p>
         Read more about using our data at the <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       </p>
       <p>
         Read more about using our data at the <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       </p>

-       

       <p>
         OSM contributors are reminded never to add data from any
         copyrighted sources (e.g. Google Maps or printed maps) without
         explicit permission from the copyright holders.
       </p>
       <p>
         OSM contributors are reminded never to add data from any
         copyrighted sources (e.g. Google Maps or printed maps) without
         explicit permission from the copyright holders.
       </p>

-      

       <p>
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-party developers.
       <p>
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-party developers.

-      
+

         See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
         and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
       </p>
         See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
         and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
       </p>

-      
+

       <h3>Our contributors</h3>
       <h3>Our contributors</h3>

-      

       <p>
         Our CC-BY-SA licence requires you to &ldquo;give the Original
         Author credit reasonable to the medium or means You are
       <p>
         Our CC-BY-SA licence requires you to &ldquo;give the Original
         Author credit reasonable to the medium or means You are


@@ -1032,41 +1022,37 @@ en:
         OpenStreetMap, it may be reasonable to credit them by directly
         reproducing their credit or by linking to it on this page.
       </p>
         OpenStreetMap, it may be reasonable to credit them by directly
         reproducing their credit or by linking to it on this page.
       </p>

-      
+

       <!--
       <!--

-      

       Information for page editors
       Information for page editors

-      
+

       The following lists only those organisations who require attribution
       as a condition of their data being used in OpenStreetMap. It is not a
       general catalogue of imports, and must not be used except when
       attribution is required to comply with the licence of the imported
       data.
       The following lists only those organisations who require attribution
       as a condition of their data being used in OpenStreetMap. It is not a
       general catalogue of imports, and must not be used except when
       attribution is required to comply with the licence of the imported
       data.

-      
+

       Any additions here must be discussed with OSM sysadmins first.
       Any additions here must be discussed with OSM sysadmins first.

-      

       -->
       -->

-      
+

       <ul id="contributors">
       <ul id="contributors">

-      

           <li><strong>Australia</strong>: Contains suburb data based
           on Australian Bureau of Statistics data.</li>
           <li><strong>Australia</strong>: Contains suburb data based
           on Australian Bureau of Statistics data.</li>

-      

           <li><strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
           Resources Canada), CanVec (&copy; Department of Natural
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).</li>
           <li><strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
           Resources Canada), CanVec (&copy; Department of Natural
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).</li>

-      

           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>

-      
+          <li><strong>Poland</strong>: Contains data from <a
+          href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright
+          UMP-pcPL contributors.</li>

           <li><strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right
           2010.</li>
           <li><strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right
           2010.</li>

-

       </ul>
       </ul>

-      
+

       <p>
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
       <p>
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or


@@ -1079,7 +1065,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:
       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}}"
       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}}"


@@ -1118,6 +1104,7 @@ en:
       the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
       opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:"
       the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
       opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:"

+      ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"

       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
       wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
       # next four translations are in pairs : please word wrap appropriately
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
       wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
       # next four translations are in pairs : please word wrap appropriately


@@ -1134,6 +1121,7 @@ en:
       more_videos: "There are {{more_videos_link}}."
       more_videos_here: "more videos here"
       get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a>, catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>, or browse through OpenStreetMap founder Steve Coast's <a href="http://www.opengeodata.org/">OpenGeoData blog</a> for the potted history of the project, which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
       more_videos: "There are {{more_videos_link}}."
       more_videos_here: "more videos here"
       get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a>, catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>, or browse through OpenStreetMap founder Steve Coast's <a href="http://www.opengeodata.org/">OpenGeoData blog</a> for the potted history of the project, which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!

+      ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.

       wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
       user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
       current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
       wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
       user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
       current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'


@@ -1169,7 +1157,7 @@ en:
       subject: "Subject"
       date: "Date"
       no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
       subject: "Subject"
       date: "Date"
       no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"

-      people_mapping_nearby: "people mapping nearby" 
+      people_mapping_nearby: "people mapping nearby"

     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"


@@ -1192,7 +1180,7 @@ en:
       title: "No such message"
       heading: "No such message"
       body: "Sorry there is no message with that id."
       title: "No such message"
       heading: "No such message"
       body: "Sorry there is no message with that id."

-    outbox: 
+    outbox:

       title: "Outbox"
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       title: "Outbox"
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"


@@ -1369,7 +1357,8 @@ en:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
       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."
       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."


@@ -1492,7 +1481,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."

-    not_found: 
+    not_found:

       sorry: "Sorry, that {{type}} could not be found."
     create:
       flash: "Registered the information successfully"
       sorry: "Sorry, that {{type}} could not be found."
     create:
       flash: "Registered the information successfully"


@@ -1508,17 +1497,19 @@ en:
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"

-      openid: "OpenID:"
-      openid description: "Use your OpenID to login"
+      openid: "{{logo}} OpenID:"

       username_heading: "Login with username and password:"
       username_heading: "Login with username and password:"

-      openid_heading: "Login with an OpenID:"
+      openid_heading: "Login with OpenID:"

       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"

-      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
+      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 suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the {{webmaster}} if you wish to discuss this.
+      webmaster: webmaster

       auth failure: "Sorry, could not log in with those details."
       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>)"

       openid missing provider: "Sorry, could not contact your OpenID provider"
       openid missing provider: "Sorry, could not contact your OpenID provider"

-      openid invalid: "Sorry, your OpenID seems misformed"
+      openid invalid: "Sorry, your OpenID seems to be malformed"

       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:
       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:


@@ -1542,7 +1533,7 @@ en:
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
     logout:
       title: "Logout"
       heading: "Logout from OpenStreetMap"

-      logout_button: "Logout"      
+      logout_button: "Logout"

     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"


@@ -1565,18 +1556,45 @@ en:
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
       fill_form: "Fill in the form and we will send you a quick email to activate your account."
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
       fill_form: "Fill in the form and we will send you a quick email to activate your account."

-      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'

       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."

+      openid: "{{logo}} OpenID:"

       password: "Password:"
       confirm password: "Confirm Password:"
       password: "Password:"
       confirm password: "Confirm Password:"

-      openID: "OpenID:"
-      openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'
-      signup: Signup
-      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."
+      use openid: "Alternatively, use {{logo}} OpenID to login"
+      openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
+      openid association: |
+        <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
+        <ul>
+          <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
+          <li>
+            If you already have an account, you can login to your account
+            using your username and password and then associate the account
+            with your OpenID in your user settings.
+          </li>
+        </ul> 
+      continue: Continue
+      flash create success message: "Thanks for signing up. We've sent a confirmation note to {{email}} and as soon as you confirm your account you'll be able to get mapping.<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"
+      read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
+      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://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      agree: Agree
+      declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
+      decline: "Decline"
+      legale_select: "Please select your country of residence:"
+      legale_names:
+        france: "France"
+        italy: "Italy"
+        rest_of_world: "Rest of the world"

     no_such_user:
       title: "No such user"
       heading: "The user {{user}} does not exist"
     no_such_user:
       title: "No such user"
       heading: "The user {{user}} does not exist"


@@ -1600,6 +1618,8 @@ en:
       ago: "({{time_in_words_ago}} ago)"
       email address: "Email address:"
       created from: "Created from:"
       ago: "({{time_in_words_ago}} ago)"
       email address: "Email address:"
       created from: "Created from:"

+      status: "Status:"
+      spam score: "Spam Score:"

       description: Description
       user location: User location
       if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your {{settings_link}} page."
       description: Description
       user location: User location
       if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your {{settings_link}} page."


@@ -1624,6 +1644,7 @@ en:
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"

+      confirm_user: "confirm this user"

       hide_user: "hide this user"
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       hide_user: "hide this user"
       unhide_user: "unhide this user"
       delete_user: "delete this user"


@@ -1652,6 +1673,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>"
       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:"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
       image: "Image:"


@@ -1675,7 +1704,13 @@ en:
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
       success: "Confirmed your account, thanks for signing up!"
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
       success: "Confirmed your account, thanks for signing up!"

-      failure: "A user account with this token has already been confirmed."
+      before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."
+      already active: "This account has already been confirmed."
+      unknown token: "That token doesn't seem to exist."
+      reconfirm: "If it's been a while since you signed up you might need to <a href=\"{{reconfirm}}\">send yourself a new confirmation email</a>."
+    confirm_resend:
+      success: "We've sent a new confirmation note to {{email}} and as soon as you confirm your account you'll be able to get mapping.<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."
+      failure: "User {{name}} not found."

     confirm_email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
     confirm_email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."


@@ -1695,6 +1730,30 @@ en:
       not_a_friend: "{{name}} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
       not_a_friend: "{{name}} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."

+    list:
+      title: Users
+      heading: Users
+      showing:
+        one: Showing page {{page}} ({{first_item}} of {{items}})
+        other: Showing page {{page}} ({{first_item}}-{{last_item}} of {{items}})
+      summary: "{{name}} created from {{ip_address}} on {{date}}"
+      summary_no_ip: "{{name}} created on {{date}}"
+      confirm: Confirm Selected Users
+      hide: Hide Selected Users
+      empty: No matching users found
+    suspended:
+      title: Account Suspended
+      heading: Account Suspended
+      webmaster: webmaster
+      body: |
+        <p>
+          Sorry, your account has been automatically suspended due to
+          suspicious activity.
+        </p>
+        <p>
+          This decision will be reviewed by an administrator shortly, or
+          you may contact the {{webmaster}} if you wish to discuss this.
+        </p>

   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."