X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02628bed1e7b5c2656bc68076403467e92462b4f..9e03b38288cb72b194fb97402673d72b204433b1:/config/locales/en.yml?ds=sidebyside
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a7d1b222c..ad857b875 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -72,6 +72,10 @@ en:
description: "Description"
languages: "Languages"
pass_crypt: "Password"
+ printable_name:
+ with_id: "{{id}}"
+ with_version: "{{id}}, v{{version}}"
+ with_name: "{{name}} ({{id}})"
map:
view: View
edit: Edit
@@ -79,21 +83,16 @@ en:
browse:
changeset:
title: "Changeset"
- changeset: "Changeset:"
+ changeset: "Changeset: {{id}}"
download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
changeset_navigation:
user:
- name: "{{user}}"
name_tooltip: "View edits by {{user}}"
- prev: "â {{id}}"
prev_tooltip: "Previous edit by {{user}}"
- next: "{{id}} â"
next_tooltip: "Next edit by {{user}}"
all:
- prev: "â {{id}}"
- next: "{{id}} â"
prev_tooltip: "Previous changeset"
next_tooltip: "Next changeset"
changeset_details:
@@ -104,26 +103,37 @@ en:
no_bounding_box: "No bounding box has been stored for this changeset."
show_area_box: "Show Area Box"
box: "box"
- has_nodes: "Has the following {{count}} nodes:"
- has_ways: "Has the following {{count}} ways:"
- has_relations: "Has the following {{count}} relations:"
+ has_nodes:
+ one: "Has the following {{count}} node:"
+ other: "Has the following {{count}} nodes:"
+ has_ways:
+ one: "Has the following {{count}} way:"
+ other: "Has the following {{count}} ways:"
+ has_relations:
+ one: "Has the following {{count}} relation:"
+ other: "Has the following {{count}} relations:"
common_details:
edited_at: "Edited at:"
edited_by: "Edited by:"
version: "Version:"
in_changeset: "In changeset:"
containing_relation:
- relation: "Relation {{relation_name}}"
- relation_as: "(as {{relation_role}})"
+ entry: "Relation {{relation_name}}"
+ entry_role: "Relation {{relation_name}} (as {{relation_role}})"
map:
loading: "Loading..."
deleted: "Deleted"
- view_larger_map: "View Larger Map"
+ larger:
+ area: "View area on larger map"
+ node: "View node on larger map"
+ way: "View way on larger map"
+ relation: "View relation on larger map"
node_details:
coordinates: "Coordinates: "
part_of: "Part of:"
node_history:
node_history: "Node History"
+ node_history_title: "Node History: {{node_name}}"
download: "{{download_xml_link}} or {{view_details_link}}"
download_xml: "Download XML"
view_details: "view details"
@@ -149,8 +159,16 @@ en:
relation_history:
relation_history: "Relation History"
relation_history_title: "Relation History: {{relation_name}}"
+ download: "{{download_xml_link}} or {{view_details_link}}"
+ download_xml: "Download XML"
+ view_details: "view details"
relation_member:
- as: "as"
+ entry: "{{type}} {{name}}"
+ entry_role: "{{type}} {{name}} as {{role}}"
+ type:
+ node: "Node"
+ way: "Way"
+ relation: "Relation"
relation:
relation: "Relation"
relation_title: "Relation: {{relation_name}}"
@@ -221,6 +239,7 @@ en:
showing_page: "Showing page"
of: "of"
changeset:
+ id: "#{{id}}"
still_editing: "(still editing)"
anonymous: "Anonymous"
no_comment: "(none)"
@@ -228,7 +247,6 @@ en:
show_area_box: "show area box"
big_area: "(big)"
view_changeset_details: "View changeset details"
- more: "more"
changesets:
id: "ID"
saved_at: "Saved at"
@@ -237,10 +255,19 @@ en:
area: "Area"
list:
title: "Changesets"
- description: "Recent edits"
- description_user: "Recent edits by {{user}}"
- description_bbox: "Recent edits within {{bbox}}"
- description_user_bbox: "Recent edits by {{user}} within {{bbox}}"
+ title_user: "Changesets by {{user}}"
+ title_bbox: "Changesets within {{bbox}}"
+ title_user_bbox: "Changesets by {{user}} within {{bbox}}"
+
+ heading: "Changesets"
+ heading_user: "Changesets"
+ heading_bbox: "Changesets"
+ heading_user_bbox: "Changesets"
+
+ description: "Recent changes"
+ description_user: "Changesets by {{user}}"
+ description_bbox: "Changesets within {{bbox}}"
+ description_user_bbox: "Changesets by {{user}} within {{bbox}}"
diary_entry:
new:
title: New Diary Entry
@@ -322,10 +349,44 @@ en:
add_marker: "Add a marker to the map"
view_larger_map: "View Larger Map"
geocoder:
+ search:
+ title:
+ latlon: 'Results from Internal'
+ us_postcode: 'Results from Geocoder.us'
+ uk_postcode: 'Results from NPEMap / FreeThe Postcode'
+ ca_postcode: 'Results from Geocoder.CA'
+ osm_namefinder: 'Results from OpenStreetMap Namefinder'
+ geonames: 'Results from GeoNames'
+ search_osm_namefinder:
+ prefix: "{{type}} "
+ suffix_place: ", {{distance}} {{direction}} of {{placename}}"
+ suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
+ suffix_suburb: "{{suffix}}, {{parentname}}"
+ description:
+ title:
+ osm_namefinder: '{{types}} from OpenStreetMap Namefinder'
+ geonames: 'Location from GeoNames'
+ types:
+ cities: Cities
+ towns: Towns
+ places: Places
+ description_osm_namefinder:
+ prefix: "{{distance}} {{direction}} of {{type}} "
results:
- results: "Results"
- type_from_source: "{{type}} from {{source_link}}"
no_results: "No results found"
+ distance:
+ zero: "less than 1km"
+ one: "about 1km"
+ other: "about {{count}}km"
+ direction:
+ south_west: "south-west"
+ south: "south"
+ south_east: "south-east"
+ east: "east"
+ north_east: "north-east"
+ north: "north"
+ north_west: "north-west"
+ west: "west"
layouts:
project_name:
# in
@@ -446,7 +507,7 @@ en:
video_to_openstreetmap: "introductory video to OpenStreetMap"
more_videos: "There are {{more_videos_link}}."
more_videos_here: "more videos here"
- get_reading: 'Get reading about OpenStreetMap on the wiki or the opengeodata blog which has podcasts to listen to also!'
+ get_reading: 'Get reading about OpenStreetMap on the wiki or the opengeodata blog which has podcasts to listen to also!'
wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.'
user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].'
current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.'
@@ -472,14 +533,6 @@ en:
greeting: "Hi,"
hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
- reset_password:
- subject: "[OpenStreetMap] Password reset"
- reset_password_plain:
- greeting: "Hi,"
- reset: "Your password has been reset to {{new_password}}"
- reset_password_html:
- greeting: "Hi,"
- reset: "Your password has been reset to {{new_password}}"
message:
inbox:
title: "Inbox"
@@ -495,6 +548,7 @@ en:
unread_button: "Mark as unread"
read_button: "Mark as read"
reply_button: "Reply"
+ delete_button: "Delete"
new:
title: "Send message"
send_message_to: "Send a new message to {{name}}"
@@ -530,15 +584,20 @@ en:
reading_your_sent_messages: "Reading your sent messages"
to: "To"
back_to_outbox: "Back to outbox"
+ sent_message_summary:
+ delete_button: "Delete"
mark:
as_read: "Message marked as read"
as_unread: "Message marked as unread"
+ delete:
+ deleted: "Message deleted"
site:
index:
js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
js_2: "OpenStreetMap uses javascript for its slippy map."
js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable javascript.'
permalink: Permalink
+ shortlink: Shortlink
license:
notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
license_name: "Creative Commons Attribution-Share Alike 2.0"
@@ -553,7 +612,7 @@ en:
anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
anon_edits_link_text: "Find out why this is the case."
flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.'
- potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+ potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
sidebar:
search_results: Search Results
close: Close
@@ -561,7 +620,6 @@ en:
search: Search
where_am_i: "Where am I?"
submit_text: "Go"
- searching: "Searching..."
search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
key:
map_key: "Map key"
@@ -582,10 +640,18 @@ en:
footway: "Footway"
rail: "Railway"
subway: "Subway"
- tram: "Light rail; tram"
- cable: "Cable car; chair lift"
- runway: "Airport Runway; taxiway"
- apron: "Airport apron; terminal"
+ tram:
+ - Light rail
+ - tram
+ cable:
+ - Cable car
+ - chair lift
+ runway:
+ - Airport Runway
+ - taxiway
+ apron:
+ - Airport apron
+ - terminal
admin: "Administrative boundary"
forest: "Forest"
wood: "Wood"
@@ -593,12 +659,16 @@ en:
park: "Park"
resident: "Residential area"
tourist: "Tourist attraction"
- common: "Common; meadow"
+ common:
+ - Common
+ - meadow
retail: "Retail area"
industrial: "Industrial area"
commercial: "Commercial area"
heathland: "Heathland"
- lake: "Lake; reservoir"
+ lake:
+ - Lake
+ - reservoir
farm: "Farm"
brownfield: "Brownfield site"
cemetery: "Cemetery"
@@ -610,7 +680,9 @@ en:
school: "School; university"
building: "Significant building"
station: "Railway station"
- summit: "Summit; peak"
+ summit:
+ - Summit
+ - peak
tunnel: "Dashed casing = tunnel"
bridge: "Black casing = bridge"
private: "Private access"
@@ -634,6 +706,7 @@ en:
owner: "Owner:"
description: "Description:"
tags: "Tags:"
+ tags_help: "comma delimited"
save_button: "Save Changes"
no_such_user:
title: "No such user"
@@ -643,6 +716,7 @@ en:
upload_gpx: "Upload GPX File"
description: "Description"
tags: "Tags"
+ tags_help: "comma delimited"
public: "Public?"
public_help: "what does this mean?"
public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
@@ -669,7 +743,7 @@ en:
edit: "edit"
owner: "Owner:"
description: "Description:"
- tags: "Tags"
+ tags: "Tags:"
none: "None"
make_public: "Make this track public permanently"
edit_track: "Edit this track"
@@ -714,15 +788,19 @@ en:
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, couldn't log in with those details."
lost_password:
- title: "lost password"
+ title: "Lost password"
heading: "Forgotten Password?"
email address: "Email Address:"
- new password button: "Send me a new password"
+ new password button: "Reset password"
notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
notice email cannot find: "Couldn't find that email address, sorry."
reset_password:
- title: "reset password"
- flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+ title: "Reset password"
+ heading: "Reset Password for {{user}}"
+ password: "Password: "
+ confirm password: "Confirm Password: "
+ reset: "Reset Password"
+ flash changed: "Your password has been changed."
flash token bad: "Didn't find that token, check the URL maybe?"
new:
title: "Create account"
@@ -769,6 +847,7 @@ en:
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
@@ -782,7 +861,7 @@ en:
public editing:
heading: "Public editing: "
enabled: "Enabled. Not anonymous and can edit data."
- enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+ enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
enabled link text: "what's this?"
disabled: "Disabled and cannot edit data, all previous edits are anonymous."
disabled link text: "why can't I edit?"