X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92951c6c00be0cb488a97463e25a5ecc8272c49e..735493837b036f5609f42a363c7f58f04525194c:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4ba9c5de2..02eff8f56 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,9 @@
en:
html:
dir: ltr
+ time:
+ formats:
+ friendly: "%e %B %Y at %H:%M"
activerecord:
# Translates all the model names, which is used in error handling on the web site
models:
@@ -76,10 +79,6 @@ en:
with_id: "{{id}}"
with_version: "{{id}}, v{{version}}"
with_name: "{{name}} ({{id}})"
- map:
- view: View
- edit: Edit
- coordinates: "Coordinates:"
browse:
changeset:
title: "Changeset"
@@ -90,7 +89,7 @@ en:
feed:
title: "Changeset {{id}}"
title_comment: "Changeset {{id}} - {{comment}}"
- changeset_navigation:
+ navigation:
paging:
user:
prev: "« {{id}}"
@@ -99,12 +98,18 @@ en:
prev: "« {{id}}"
next: "{{id}} »"
user:
- name_tooltip: "View edits by {{user}}"
- prev_tooltip: "Previous edit by {{user}}"
- next_tooltip: "Next edit by {{user}}"
+ name_changeset_tooltip: "View edits by {{user}}"
+ prev_changeset_tooltip: "Previous edit by {{user}}"
+ next_changeset_tooltip: "Next edit by {{user}}"
all:
- prev_tooltip: "Previous changeset"
- next_tooltip: "Next changeset"
+ prev_node_tooltip: "Previous node"
+ next_node_tooltip: "Next node"
+ prev_way_tooltip: "Previous way"
+ next_way_tooltip: "Next way"
+ prev_relation_tooltip: "Previous relation"
+ next_relation_tooltip: "Next relation"
+ prev_changeset_tooltip: "Previous changeset"
+ next_changeset_tooltip: "Next changeset"
changeset_details:
created_at: "Created at:"
closed_at: "Closed at:"
@@ -234,6 +239,10 @@ en:
# There is no 'relation' type because it is not represented in OpenLayers
tag_details:
tags: "Tags:"
+ wiki_link:
+ key: "The wiki description page for the {{key}} tag"
+ tag: "The wiki description page for the {{key}}={{value}} tag"
+ wikipedia_link: "The {{page}} article on Wikipedia"
way_details:
nodes: "Nodes:"
part_of: "Part of:"
@@ -313,7 +322,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"
@@ -328,7 +337,7 @@ en:
heading: "The user {{user}} does not exist"
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
diary_entry:
- posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
+ posted_by: "Posted by {{link_user}} on {{created}} in {{language_link}}"
comment_link: Comment on this entry
reply_link: Reply to this entry
comment_count:
@@ -338,9 +347,13 @@ en:
hide_link: Hide this entry
confirm: Confirm
diary_comment:
- comment_from: "Comment from {{link_user}} at {{comment_created_at}}"
+ comment_from: "Comment from {{link_user}} on {{comment_created_at}}"
hide_link: Hide this comment
confirm: Confirm
+ location:
+ location: "Location:"
+ view: "View"
+ edit: "Edit"
feed:
user:
title: "OpenStreetMap diary entries for {{user}}"
@@ -362,6 +375,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,23 +900,23 @@ 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
intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
- intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+ intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}. Other supporters of the project are listed in the {{partners}}."
intro_3_ucl: "UCL VR Centre"
intro_3_bytemark: "bytemark"
+ intro_3_partners: "wiki"
+ intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
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."
@@ -908,6 +924,7 @@ en:
help_wiki: "Help & Wiki"
help_wiki_tooltip: "Help & Wiki site for the project"
help_wiki_url: "http://wiki.openstreetmap.org"
+ copyright: "Copyright & License"
news_blog: "News blog"
news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
shop: Shop
@@ -935,7 +952,8 @@ en:
friend_notification:
subject: "[OpenStreetMap] {{user}} added you as a friend"
had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
- see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+ see_their_profile: "You can see their profile at {{userurl}}."
+ befriend_them: "You can also add them as a friend at {{befriendurl}}."
gpx_notification:
greeting: "Hi,"
your_gpx_file: "It looks like your GPX file"
@@ -1032,9 +1050,13 @@ en:
message_sent: "Message sent"
limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
no_such_user:
- title: "No such user or message"
- heading: "No such user or message"
- body: "Sorry there is no user or message with that name or id"
+ title: "No such user"
+ heading: "No such user"
+ body: "Sorry there is no user with that name."
+ no_such_message:
+ title: "No such message"
+ heading: "No such message"
+ body: "Sorry there is no message with that id."
outbox:
title: "Outbox"
my_inbox: "My {{inbox_link}}"
@@ -1046,6 +1068,8 @@ en:
date: "Date"
no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
people_mapping_nearby: "people mapping nearby"
+ reply:
+ wrong_user: "You are logged in as `{{user}}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
read:
title: "Read message"
reading_your_messages: "Reading your messages"
@@ -1058,6 +1082,7 @@ en:
reading_your_sent_messages: "Reading your sent messages"
to: "To"
back_to_outbox: "Back to outbox"
+ wrong_user: "You are logged in as `{{user}}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it."
sent_message_summary:
delete_button: "Delete"
mark:
@@ -1180,7 +1205,7 @@ en:
heading: "Editing trace {{name}}"
filename: "Filename:"
download: "download"
- uploaded_at: "Uploaded at:"
+ uploaded_at: "Uploaded:"
points: "Points:"
start_coord: "Start coordinate:"
map: "map"
@@ -1221,7 +1246,7 @@ en:
pending: "PENDING"
filename: "Filename:"
download: "download"
- uploaded: "Uploaded at:"
+ uploaded: "Uploaded:"
points: "Points:"
start_coordinates: "Start coordinate:"
map: "map"
@@ -1235,8 +1260,9 @@ en:
trace_not_found: "Trace not found!"
visibility: "Visibility:"
trace_paging_nav:
- showing: "Showing page"
- of: "of"
+ showing_page: "Showing page {{page}}"
+ next: "Next »"
+ previous: "« Previous"
trace:
pending: "PENDING"
count_points: "{{count}} points"
@@ -1350,12 +1376,17 @@ en:
openid: "OpenID:"
openid description: "Use your OpenID to login"
alternatively: "Alternatively"
+ remember: "Remember me:"
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"
+ logout:
+ title: "Logout"
+ heading: "Logout from OpenStreetMap"
+ logout_button: "Logout"
lost_password:
title: "Lost password"
heading: "Forgotten Password?"
@@ -1387,7 +1418,7 @@ en:
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'
+ 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:
@@ -1400,6 +1431,7 @@ en:
my edits: my edits
my traces: my traces
my settings: my settings
+ oauth settings: oauth settings
blocks on me: blocks on me
blocks by me: blocks by me
send message: send message
@@ -1412,23 +1444,16 @@ 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."
- if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
+ 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."
settings_link_text: settings
your friends: Your friends
no friends: You have not added any friends yet.
km away: "{{count}}km away"
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"
+ nearby users: "Other nearby users"
+ no nearby users: "There are no other users who admit to mapping nearby yet."
role:
administrator: "This user is an administrator"
moderator: "This user is a moderator"
@@ -1447,12 +1472,15 @@ en:
unhide_user: "unhide this user"
delete_user: "delete this user"
confirm: "Confirm"
- friend_map:
- your location: Your location
- nearby mapper: "Nearby mapper: [[nearby_user]]"
+ popup:
+ your location: "Your location"
+ nearby mapper: "Nearby mapper"
+ friend: "Friend"
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:"
@@ -1470,6 +1498,12 @@ 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).