X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ba65dcc97a5082201e86d637c6e6828db68c8951..bbf30e76e4bfcd70e62fc84ecd32c5e494506e9e:/config/locales/en.yml?ds=sidebyside
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 962551b41..b358cf8d3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -313,7 +313,7 @@ en:
save_button: "Save"
marker_text: Diary entry location
view:
- title: "Users' diaries | {{user}}"
+ title: "{{user}}'s diary | {{title}}"
user_title: "{{user}}'s diary"
leave_a_comment: "Leave a comment"
login_to_leave_a_comment: "{{login_link}} to leave a comment"
@@ -362,6 +362,9 @@ en:
embeddable_html: "Embeddable HTML"
licence: "Licence"
export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.'
+ too_large:
+ heading: "Area Too Large"
+ body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area."
options: "Options"
format: "Format"
scale: "Scale"
@@ -884,15 +887,13 @@ en:
sign_up: sign up
sign_up_tooltip: Create an account for editing
view: View
- view_tooltip: View maps
+ view_tooltip: View the map
edit: Edit
- edit_tooltip: Edit maps
history: History
- history_tooltip: Changeset history
export: Export
export_tooltip: Export map data
gps_traces: GPS Traces
- gps_traces_tooltip: Manage traces
+ gps_traces_tooltip: Manage GPS traces
user_diaries: User Diaries
user_diaries_tooltip: View user diaries
tag_line: The Free Wiki World Map
@@ -1350,10 +1351,15 @@ en:
create_account: "create an account"
email or username: "Email Address or Username:"
password: "Password:"
+ openid: "OpenID:"
+ openid description: "Use your OpenID to login"
+ alternatively: "Alternatively"
lost password link: "Lost your password?"
login_button: "Login"
account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account."
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 misformed"
lost_password:
title: "Lost password"
heading: "Forgotten Password?"
@@ -1384,6 +1390,8 @@ en:
display name description: "Your publicly displayed username. You can change this later in the preferences."
password: "Password:"
confirm password: "Confirm Password:"
+ openID: "OpenID:"
+ openID description: '(Optional) If you have an OpenID 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 :-)
Please note that you will not be able to login until you've received and confirmed your email address.
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."
no_such_user:
@@ -1408,10 +1416,6 @@ en:
ago: "({{time_in_words_ago}} ago)"
email address: "Email address:"
created from: "Created from:"
- user image heading: User image
- delete image: Delete Image
- upload an image: Upload an image
- add image: Add Image
description: Description
user location: User location
no home location: "No home location has been set."
@@ -1423,7 +1427,6 @@ en:
m away: "{{count}}m away"
nearby users: "Nearby users:"
no nearby users: "There are no users who admit to mapping nearby yet."
- change your settings: change your settings
my_oauth_details: "View my OAuth details"
role:
administrator: "This user is an administrator"
@@ -1449,7 +1452,13 @@ en:
account:
title: "Edit account"
my settings: My settings
+ current email address: "Current Email Address:"
+ new email address: "New Email Address:"
email never displayed publicly: "(never displayed publicly)"
+ openid:
+ openid: "OpenID:"
+ link: "http://wiki.openstreetmap.org/wiki/OpenID"
+ link text: "what is this?"
public editing:
heading: "Public editing:"
enabled: "Enabled. Not anonymous and can edit data."
@@ -1462,6 +1471,11 @@ en:
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. Since the 0.6 API changeover, only public users can edit map data. (find out why).