X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/058b94df0927adf07a2790b37cc8963b9d747221..81f5c72c76f36e7c712bac0ad54b37d945caa51f:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a92a7fe19..2a8479a22 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -297,6 +297,8 @@ en:
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
@@ -931,7 +933,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
@@ -1060,7 +1062,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}}"
@@ -1489,6 +1490,9 @@ en:
create_account: "create an account"
email or username: "Email Address or Username:"
password: "Password:"
+ openid: "{{logo}} OpenID:"
+ username_heading: "Login with username and password:"
+ openid_heading: "Login with OpenID:"
remember: "Remember me:"
lost password link: "Lost your password?"
login_button: "Login"
@@ -1496,6 +1500,28 @@ en:
account suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the {{webmaster}} if you wish to discuss this.
webmaster: webmaster
auth failure: "Sorry, could not log in with those details."
+ 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"
+ openid_providers:
+ openid:
+ title: Login with an OpenID URL
+ alt: Login with an OpenID URL
+ yahoo:
+ title: Login with a Yahoo! OpenID
+ alt: Login with a Yahoo! OpenID
+ google:
+ title: Login with a Google OpenID
+ alt: Login with a Google OpenID
+ myopenid:
+ title: Login with a myOpenID OpenID
+ alt: Login with a myOpenID OpenID
+ wordpress:
+ title: Login with a Wordpress.com OpenID
+ alt: Login with a Wordpress.com OpenID
+ myspace:
+ title: Login with a MySpace OpenID
+ alt: Login with a MySpace OpenID
logout:
title: "Logout"
heading: "Logout from OpenStreetMap"
@@ -1528,14 +1554,27 @@ en:
not displayed publicly: 'Not displayed publicly (see privacy policy)'
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:"
+ 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: |
+
Your OpenID is not associated with a OpenStreetMap account yet.
+