X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/694fa065c0c943664072a80b552d4985967176f9..a1f73967a929a45e32d3b517ab5918c363714c97:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2fcd737c9..d426faabe 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -48,7 +48,7 @@ en:
body: "Body"
diary_entry:
user: "User"
- title: "Title"
+ title: "Subject"
latitude: "Latitude"
longitude: "Longitude"
language: "Language"
@@ -66,7 +66,7 @@ en:
description: "Description"
message:
sender: "Sender"
- title: "Title"
+ title: "Subject"
body: "Body"
recipient: "Recipient"
user:
@@ -79,7 +79,7 @@ en:
printable_name:
with_id: "%{id}"
with_version: "%{id}, v%{version}"
- with_name: "%{name} (%{id})"
+ with_name_html: "%{name} (%{id})"
editor:
default: "Default (currently %{name})"
potlatch:
@@ -95,88 +95,68 @@ en:
name: "Remote Control"
description: "Remote Control (JOSM or Merkaartor)"
browse:
+ created: "Created"
+ closed: "Closed"
+ created_html: "Created %{time} ago"
+ closed_html: "Closed %{time} ago"
+ created_by_html: "Created %{time} ago by %{user}"
+ deleted_by_html: "Deleted %{time} ago by %{user}"
+ edited_by_html: "Edited %{time} ago by %{user}"
+ closed_by_html: "Closed %{time} ago by %{user}"
+ version: "Version"
+ in_changeset: "Changeset"
+ anonymous: "anonymous"
+ no_comment: "(no comment)"
+ part_of: "Part of"
+ download_xml: "Download XML"
+ view_history: "View History"
+ view_details: "View Details"
+ location: "Location:"
changeset:
- title: "Changeset"
- changeset: "Changeset %{id}"
+ title: "Changeset: %{id}"
+ belongs_to: "Author"
+ node: "Nodes (%{count})"
+ node_paginated: "Nodes (%{x}-%{y} of %{count})"
+ way: "Ways (%{count})"
+ way_paginated: "Ways (%{x}-%{y} of %{count})"
+ relation: "Relations (%{count})"
+ relation_paginated: "Relations (%{x}-%{y} of %{count})"
+ comment: "Comments (%{count})"
+ hidden_commented_by: "Hidden comment from %{user} %{when} ago"
+ commented_by: "Comment from %{user} %{when} ago"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
title: "Changeset %{id}"
title_comment: "Changeset %{id} - %{comment}"
- navigation:
- paging:
- user:
- prev: "« %{id}"
- next: "%{id} »"
- all:
- prev: "« %{id}"
- next: "%{id} »"
- user:
- name_changeset_tooltip: "View edits by %{user}"
- prev_changeset_tooltip: "Previous edit by %{user}"
- next_changeset_tooltip: "Next edit by %{user}"
- all:
- 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"
- prev_note_tooltip: "Previous note"
- next_note_tooltip: "Next note"
- changeset_details:
- created_at: "Created"
- closed_at: "Closed"
- belongs_to: "Author"
- has_nodes: "Nodes (%{count})"
- has_ways: "Ways (%{count})"
- has_relations: "Relations (%{count})"
- no_comment: "(no comment)"
- ago: "%{ago} ago"
- by: "by"
- common_details:
- edited: "Edited"
- deleted: "Deleted"
- by: "by"
- version: "Version"
- in_changeset: "Changeset"
- changeset_comment: "Comment"
+ join_discussion: "Log in to join the discussion"
+ discussion: Discussion
+ node:
+ title: "Node: %{name}"
+ history_title: "Node History: %{name}"
+ way:
+ title: "Way: %{name}"
+ history_title: "Way History: %{name}"
+ nodes: "Nodes"
+ also_part_of:
+ one: "part of way %{related_ways}"
+ other: "part of ways %{related_ways}"
+ relation:
+ title: "Relation: %{name}"
+ history_title: "Relation History: %{name}"
+ members: "Members"
+ relation_member:
+ entry: "%{type} %{name}"
+ entry_role: "%{type} %{name} as %{role}"
+ type:
+ node: "Node"
+ way: "Way"
+ relation: "Relation"
containing_relation:
entry: "Relation %{relation_name}"
entry_role: "Relation %{relation_name} (as %{relation_role})"
- map:
- loading: "Loading..."
- deleted: "Deleted"
- 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"
- note: "View note on larger map"
- edit:
- area: "Edit area"
- node: "Edit node"
- way: "Edit way"
- relation: "Edit relation"
- note: "Edit note"
- node_details:
- coordinates: "Coordinates:"
- part_of: "Part of:"
- node_history:
- node_history: "Node History"
- node_history_title: "Node History: %{node_name}"
- download_xml: "Download XML"
- view_details: "View details"
- node:
- node: "Node"
- node_title: "Node: %{node_name}"
- download_xml: "Download XML"
- view_history: "View history"
- edit: "Edit node"
not_found:
- sorry: "Sorry, the %{type} with the id %{id}, could not be found."
+ sorry: "Sorry, %{type} #%{id} could not be found."
type:
node: node
way: way
@@ -189,9 +169,6 @@ en:
way: way
relation: relation
changeset: changeset
- paging_nav:
- showing_page: "page"
- of: "of"
redacted:
redaction: "Redaction %{id}"
message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
@@ -199,111 +176,47 @@ en:
node: "node"
way: "way"
relation: "relation"
- relation_details:
- members: "Members:"
- part_of: "Part of:"
- relation_history:
- relation_history: "Relation History"
- relation_history_title: "Relation History: %{relation_name}"
- download_xml: "Download XML"
- view_details: "View details"
- relation_member:
- entry: "%{type} %{name}"
- entry_role: "%{type} %{name} as %{role}"
- type:
- node: "Node"
- way: "Way"
- relation: "Relation"
- relation:
- relation: "Relation"
- relation_title: "Relation: %{relation_name}"
- download_xml: "Download XML"
- view_history: "View history"
start_rjs:
- notes_layer_name: "Browse Notes"
- data_layer_name: "Browse Map Data"
- data_frame_title: "Data"
- zoom_or_select: "Zoom in or select an area of the map to view"
- view_data: "View data for current map view"
- manually_select: "Manually select a different area"
- hide_areas: "Hide areas"
- show_areas: "Show areas"
- loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+ feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
load_data: "Load Data"
- unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})"
loading: "Loading..."
- show_history: "Show History"
- wait: "Wait..."
- history_for_feature: "History for %{feature}"
- details: "Details"
- private_user: "private user"
- edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
- object_list:
- heading: "Object list"
- back: "Back to object list"
- type:
- node: "Node"
- way: "Way"
- # There is no 'relation' type because it is not represented in OpenLayers
- api: "Retrieve this area from the API"
- details: "Details"
- selected:
- type:
- node: "Node %{id}"
- way: "Way %{id}"
- # There is no 'relation' type because it is not represented in OpenLayers
- history:
- type:
- node: "Node %{id}"
- way: "Way %{id}"
- # 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"
+ wikidata_link: "The %{page} item on Wikidata"
wikipedia_link: "The %{page} article on Wikipedia"
- way_details:
- nodes: "Nodes:"
- part_of: "Part of:"
- also_part_of:
- one: "part of way %{related_ways}"
- other: "part of ways %{related_ways}"
- way_history:
- way_history: "Way History"
- way_history_title: "Way History: %{way_name}"
- download_xml: "Download XML"
- view_details: "View details"
- way:
- way: "Way"
- way_title: "Way: %{way_name}"
- download_xml: "Download XML"
- view_history: "View history"
- edit: "Edit way"
+ telephone_link: "Call %{phone_number}"
note:
- title: "Note"
- open_title: "Unresolved note: %{note_name}"
- closed_title: "Resolved note: %{note_name}"
- opened: "Opened"
- last_modified: "Last modified"
- closed: "Closed"
- at_html: "%{when} ago"
- at_by_html: "%{when} ago by %{user}"
+ title: "Note: %{id}"
+ new_note: "New Note"
description: "Description"
- comments: "Comments"
- anonymous: "anonymous"
+ open_title: "Unresolved note #%{note_name}"
+ closed_title: "Resolved note #%{note_name}"
+ hidden_title: "Hidden note #%{note_name}"
+ open_by: "Created by %{user} %{when} ago"
+ open_by_anonymous: "Created by anonymous %{when} ago"
+ commented_by: "Comment from %{user} %{when} ago"
+ commented_by_anonymous: "Comment from anonymous %{when} ago"
+ closed_by: "Resolved by %{user} %{when} ago"
+ closed_by_anonymous: "Resolved by anonymous %{when} ago"
+ reopened_by: "Reactivated by %{user} %{when} ago"
+ reopened_by_anonymous: "Reactivated by anonymous %{when} ago"
+ hidden_by: "Hidden by %{user} %{when} ago"
+ query:
+ title: "Query Features"
+ introduction: "Click on the map to find nearby features."
+ nearby: "Nearby features"
+ enclosing: "Enclosing features"
changeset:
changeset_paging_nav:
showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
changeset:
- still_editing: "(still editing)"
anonymous: "Anonymous"
- no_comment: "(no comment)"
no_edits: "(no edits)"
- show_area_box: "show area box"
- big_area: "(big)"
view_changeset_details: "View changeset details"
changesets:
id: "ID"
@@ -316,11 +229,22 @@ en:
title_user: "Changesets by %{user}"
title_friend: "Changesets by your friends"
title_nearby: "Changesets by nearby users"
- empty: "No changesets in this area."
- no_more: "No more changesets in this area."
+ empty: "No changesets found."
+ empty_area: "No changesets in this area."
+ empty_user: "No changesets by this user."
+ no_more: "No more changesets found."
+ no_more_area: "No more changesets in this area."
+ no_more_user: "No more changesets by this user."
load_more: "Load more"
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
+ rss:
+ title_all: OpenStreetMap changeset discussion
+ title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+ comment: "New comment on changeset #%{changeset_id} by %{author}"
+ commented_at_html: "Updated %{when} ago"
+ commented_at_by_html: "Updated %{when} ago by %{user}"
+ full: Full discussion
diary_entry:
new:
title: New Diary Entry
@@ -396,6 +320,7 @@ en:
newer_comments: "Newer Comments"
older_comments: "Older Comments"
export:
+ title: "Export"
start:
area_to_export: "Area to Export"
manually_select: "Manually select a different area"
@@ -406,11 +331,14 @@ en:
licence: "Licence"
export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).'
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, or use one of the following sources for bulk data downloads:"
+ advice: "If the above export fails, please consider using one of the sources listed below:"
+ body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
planet:
title: "Planet OSM"
description: "Regularly-updated copies of the complete OpenStreetMap database"
+ overpass:
+ title: "Overpass API"
+ description: "Download this bounding box from a mirror of the OpenStreetMap database"
geofabrik:
title: "Geofabrik Downloads"
description: "Regularly-updated extracts of continents, countries, and selected cities"
@@ -432,16 +360,10 @@ en:
output: "Output"
paste_html: "Paste HTML to embed in website"
export_button: "Export"
- start_rjs:
- export: "Export"
- drag_a_box: "Drag a box on the map to select an area"
- manually_select: "Manually select a different area"
- click_add_marker: "Click on the map to add a marker"
- change_marker: "Change marker position"
- add_marker: "Add a marker to the 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'
@@ -453,8 +375,10 @@ en:
prefix_format: "%{name}"
prefix:
aerialway:
+ cable_car: "Cable Car"
chair_lift: "Chair Lift"
drag_lift: "Drag Lift"
+ gondola: "Gondola Lift"
station: "Aerialway Station"
aeroway:
aerodrome: "Aerodrome"
@@ -465,11 +389,9 @@ en:
taxiway: "Taxiway"
terminal: "Terminal"
amenity:
- airport: "Airport"
+ animal_shelter: "Animal Shelter"
arts_centre: "Arts Centre"
- artwork: "Artwork"
atm: "ATM"
- auditorium: "Auditorium"
bank: "Bank"
bar: "Bar"
bbq: "BBQ"
@@ -477,6 +399,7 @@ en:
bicycle_parking: "Cycle Parking"
bicycle_rental: "Cycle Rental"
biergarten: "Beer Garden"
+ boat_rental: "Boat Rental"
brothel: "Brothel"
bureau_de_change: "Bureau de Change"
bus_station: "Bus Station"
@@ -486,9 +409,10 @@ en:
car_wash: "Car Wash"
casino: "Casino"
charging_station: "Charging Station"
+ childcare: "Childcare"
cinema: "Cinema"
clinic: "Clinic"
- club: "Club"
+ clock: "Clock"
college: "College"
community_centre: "Community Centre"
courthouse: "Courthouse"
@@ -507,25 +431,25 @@ en:
food_court: "Food Court"
fountain: "Fountain"
fuel: "Fuel"
+ gambling: "Gambling"
grave_yard: "Grave Yard"
gym: "Fitness Centre / Gym"
- hall: "Hall"
health_centre: "Health Centre"
hospital: "Hospital"
- hotel: "Hotel"
hunting_stand: "Hunting Stand"
ice_cream: "Ice Cream"
kindergarten: "Kindergarten"
library: "Library"
market: "Market"
marketplace: "Marketplace"
- mountain_rescue: "Mountain Rescue"
+ monastery: "Monastery"
+ motorcycle_parking: "Motorcycle Parking"
nightclub: "Night Club"
nursery: "Nursery"
nursing_home: "Nursing Home"
office: "Office"
- park: "Park"
parking: "Parking"
+ parking_entrance: "Parking Entrance"
pharmacy: "Pharmacy"
place_of_worship: "Place of Worship"
police: "Police"
@@ -535,7 +459,6 @@ en:
prison: "Prison"
pub: "Pub"
public_building: "Public Building"
- public_market: "Public Market"
reception_area: "Reception Area"
recycling: "Recycling Point"
restaurant: "Restaurant"
@@ -544,13 +467,11 @@ en:
school: "School"
shelter: "Shelter"
shop: "Shop"
- shopping: "Shopping"
shower: "Shower"
social_centre: "Social Centre"
social_club: "Social Club"
social_facility: "Social Facility"
studio: "Studio"
- supermarket: "Supermarket"
swimming_pool: "Swimming Pool"
taxi: "Taxi"
telephone: "Public Telephone"
@@ -562,8 +483,7 @@ en:
veterinary: "Veterinary Surgery"
village_hall: "Village Hall"
waste_basket: "Waste Basket"
- wifi: "WiFi Access"
- WLAN: "WiFi Access"
+ waste_disposal: "Waste Disposal"
youth_centre: "Youth Centre"
boundary:
administrative: "Administrative Boundary"
@@ -578,22 +498,35 @@ en:
"yes": "Bridge"
building:
"yes": "Building"
+ craft:
+ brewery: "Brewery"
+ carpenter: "Carpenter"
+ electrician: "Electrician"
+ gardener: "Gardener"
+ painter: "Painter"
+ photographer: "Photographer"
+ plumber: "Plumber"
+ shoemaker: "Shoemaker"
+ tailor: "Tailor"
+ "yes": "Craft Shop"
emergency:
- fire_hydrant: "Fire Hydrant"
+ ambulance_station: "Ambulance Station"
+ defibrillator: "Defibrillator"
+ landing_site: "Emergency Landing Site"
phone: "Emergency Phone"
highway:
+ abandoned: "Abandoned Highway"
bridleway: "Bridleway"
bus_guideway: "Guided Bus Lane"
bus_stop: "Bus Stop"
- byway: "Byway"
construction: "Highway under Construction"
cycleway: "Cycle Path"
+ elevator: "Elevator"
emergency_access_point: "Emergency Access Point"
footway: "Footpath"
ford: "Ford"
living_street: "Living Street"
milestone: "Milestone"
- minor: "Minor Road"
motorway: "Motorway"
motorway_junction: "Motorway Junction"
motorway_link: "Motorway Road"
@@ -604,7 +537,7 @@ en:
primary_link: "Primary Road"
proposed: "Proposed Road"
raceway: "Raceway"
- residential: "Residential"
+ residential: "Residential Road"
rest_area: "Rest Area"
road: "Road"
secondary: "Secondary Road"
@@ -614,37 +547,44 @@ en:
speed_camera: "Speed Camera"
steps: "Steps"
street_lamp: "Street Lamp"
- stile: "Stile"
tertiary: "Tertiary Road"
tertiary_link: "Tertiary Road"
track: "Track"
+ traffic_signals: "Traffic Signals"
trail: "Trail"
trunk: "Trunk Road"
trunk_link: "Trunk Road"
unclassified: "Unclassified Road"
unsurfaced: "Unsurfaced Road"
+ "yes" : "Road"
historic:
archaeological_site: "Archaeological Site"
battlefield: "Battlefield"
boundary_stone: "Boundary Stone"
- building: "Building"
+ building: "Historic Building"
+ bunker: "Bunker"
castle: "Castle"
church: "Church"
+ city_gate: "City Gate"
citywalls: "City Walls"
fort: "Fort"
+ heritage: "Heritage Site"
house: "House"
icon: "Icon"
manor: "Manor"
memorial: "Memorial"
mine: "Mine"
monument: "Monument"
- museum: "Museum"
+ roman_road: "Roman Road"
ruins: "Ruins"
+ stone: "Stone"
tomb: "Tomb"
tower: "Tower"
wayside_cross: "Wayside Cross"
wayside_shrine: "Wayside Shrine"
wreck: "Wreck"
+ junction:
+ "yes": "Junction"
landuse:
allotments: "Allotments"
basin: "Basin"
@@ -666,9 +606,6 @@ en:
military: "Military Area"
mine: "Mine"
orchard: "Orchard"
- nature_reserve: "Nature Reserve"
- park: "Park"
- piste: "Piste"
quarry: "Quarry"
railway: "Railway"
recreation_ground: "Recreation Ground"
@@ -679,16 +616,19 @@ en:
road: "Road Area"
village_green: "Village Green"
vineyard: "Vineyard"
- wetland: "Wetland"
- wood: "Wood"
+ "yes": "Landuse"
leisure:
beach_resort: "Beach Resort"
bird_hide: "Bird Hide"
+ club: "Club"
common: "Common Land"
+ dog_park: "Dog Park"
fishing: "Fishing Area"
+ fitness_centre: "Fitness Centre"
fitness_station: "Fitness Station"
garden: "Garden"
golf_course: "Golf Course"
+ horse_riding: "Horse Riding"
ice_rink: "Ice Rink"
marina: "Marina"
miniature_golf: "Miniature Golf"
@@ -697,6 +637,7 @@ en:
pitch: "Sports Pitch"
playground: "Playground"
recreation_ground: "Recreation Ground"
+ resort: "Resort"
sauna: "Sauna"
slipway: "Slipway"
sports_centre: "Sports Centre"
@@ -704,6 +645,13 @@ en:
swimming_pool: "Swimming Pool"
track: "Running Track"
water_park: "Water Park"
+ "yes": "Leisure"
+ man_made:
+ lighthouse: "Lighthouse"
+ pipeline: "Pipeline"
+ tower: "Tower"
+ works: "Factory"
+ "yes": "Man-made"
military:
airfield: "Military Airfield"
barracks: "Barracks"
@@ -715,16 +663,15 @@ en:
beach: "Beach"
cape: "Cape"
cave_entrance: "Cave Entrance"
- channel: "Channel"
cliff: "Cliff"
crater: "Crater"
dune: "Dune"
- feature: "Feature"
fell: "Fell"
fjord: "Fjord"
forest: "Forest"
geyser: "Geyser"
glacier: "Glacier"
+ grassland: "Grassland"
heath: "Heath"
hill: "Hill"
island: "Island"
@@ -736,11 +683,11 @@ en:
point: "Point"
reef: "Reef"
ridge: "Ridge"
- river: "River"
rock: "Rock"
+ saddle: "Saddle"
+ sand: "Sand"
scree: "Scree"
scrub: "Scrub"
- shoal: "Shoal"
spring: "Spring"
stone: "Stone"
strait: "Strait"
@@ -749,10 +696,10 @@ en:
volcano: "Volcano"
water: "Water"
wetland: "Wetland"
- wetlands: "Wetlands"
wood: "Wood"
office:
accountant: "Accountant"
+ administrative: "Administration"
architect: "Architect"
company: "Company"
employment_agency: "Employment Agency"
@@ -765,6 +712,8 @@ en:
travel_agent: "Travel Agency"
"yes": "Office"
place:
+ allotments: "Allotments"
+ block: "Block"
airport: "Airport"
city: "City"
country: "Country"
@@ -789,6 +738,7 @@ en:
town: "Town"
unincorporated_area: "Unincorporated Area"
village: "Village"
+ "yes": "Place"
railway:
abandoned: "Abandoned Railway"
construction: "Railway under Construction"
@@ -809,12 +759,11 @@ en:
spur: "Railway Spur"
station: "Railway Station"
stop: "Railway Stop"
- subway: "Subway Station"
+ subway: "Subway"
subway_entrance: "Subway Entrance"
switch: "Railway Points"
tram: "Tramway"
tram_stop: "Tram Stop"
- yard: "Railway Yard"
shop:
alcohol: "Off License"
antiques: "Antiques"
@@ -893,6 +842,7 @@ en:
"yes": "Shop"
tourism:
alpine_hut: "Alpine Hut"
+ apartment: "Apartment"
artwork: "Artwork"
attraction: "Attraction"
bed_and_breakfast: "Bed and Breakfast"
@@ -900,16 +850,15 @@ en:
camp_site: "Camp Site"
caravan_site: "Caravan Site"
chalet: "Chalet"
+ gallery: "Gallery"
guest_house: "Guest House"
hostel: "Hostel"
hotel: "Hotel"
information: "Information"
- lean_to: "Lean To"
motel: "Motel"
museum: "Museum"
picnic_site: "Picnic Site"
theme_park: "Theme Park"
- valley: "Valley"
viewpoint: "Viewpoint"
zoo: "Zoo"
tunnel:
@@ -919,7 +868,6 @@ en:
artificial: "Artificial Waterway"
boatyard: "Boatyard"
canal: "Canal"
- connector: "Waterway Connector"
dam: "Dam"
derelict_canal: "Derelict Canal"
ditch: "Ditch"
@@ -927,16 +875,14 @@ en:
drain: "Drain"
lock: "Lock"
lock_gate: "Lock Gate"
- mineral_spring: "Mineral Spring"
mooring: "Mooring"
rapids: "Rapids"
river: "River"
- riverbank: "Riverbank"
stream: "Stream"
wadi: "Wadi"
waterfall: "Waterfall"
- water_point: "Water Point"
weir: "Weir"
+ "yes": "Waterway"
admin_levels:
level2: "Country Boundary"
level4: "State Boundary"
@@ -956,19 +902,6 @@ en:
results:
no_results: "No results found"
more_results: "More results"
- 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
@@ -978,13 +911,12 @@ en:
logo:
alt_text: OpenStreetMap logo
home: Go to Home Location
- logout: Logout
+ logout: Log Out
log_in: Log In
log_in_tooltip: Log in with an existing account
sign_up: Sign Up
+ start_mapping: Start Mapping
sign_up_tooltip: Create an account for editing
- view: View
- view_tooltip: View the map
edit: Edit
history: History
export: Export
@@ -997,7 +929,7 @@ en:
edit_with: Edit with %{editor}
tag_line: The Free Wiki World Map
intro_header: Welcome to OpenStreetMap!
- intro_text: OpenStreetMap is a free and editable map of the world maintained by an active community of contributors.
+ intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
intro_2_create_account: "Create a user account"
partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
partners_ucl: "the UCL VR Centre"
@@ -1010,7 +942,7 @@ en:
donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
help: Help
about: About
- copyright: "Copyright & License"
+ copyright: Copyright
community: Community
community_blogs: "Community Blogs"
community_blogs_title: "Blogs from members of the OpenStreetMap community"
@@ -1020,6 +952,7 @@ en:
title: Support OpenStreetMap with a monetary donation
text: Make a Donation
learn_more: "Learn More"
+ more: More
license_page:
foreign:
title: About this translation
@@ -1033,9 +966,10 @@ en:
legal_babble:
title_html: Copyright and License
intro_1_html: |
- OpenStreetMap is <i>open data</i>, licensed under the <a
+ OpenStreetMap<sup><a href="#trademarks">®</a></sup> is <i>open data</i>, licensed under the <a
href="http://opendatacommons.org/licenses/odbl/">Open Data
- Commons Open Database License</a> (ODbL).
+ Commons Open Database License</a> (ODbL) by the <a
+ href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
intro_2_html: |
You are free to copy, distribute, transmit and adapt our data,
as long as you credit OpenStreetMap and its
@@ -1071,6 +1005,7 @@ en:
more_title_html: Finding out more
more_1_html: |
Read more about using our data, and how to credit us, at the <a
+ href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
FAQ</a>.
more_2_html: |
@@ -1096,6 +1031,11 @@ en:
Resources Canada), CanVec (© Department of Natural
Resources Canada), and StatCan (Geography Division,
Statistics Canada).
+ contributors_fi_html: |
+ <strong>Finland</strong>: Contains data from the
+ National Land Survey of Finland's Topographic Database
+ and other datasets, under the
+ <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.
contributors_fr_html: |
<strong>France</strong>: Contains data sourced from
Direction Générale des Impôts.
@@ -1105,6 +1045,11 @@ en:
contributors_nz_html: |
<strong>New Zealand</strong>: Contains data sourced from
Land Information New Zealand. Crown Copyright reserved.
+ contributors_si_html: |
+ <strong>Slovenia</strong>: Contains data from the
+ <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
+ <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+ (public information of Slovenia).
contributors_za_html: |
<strong>South Africa</strong>: Contains data sourced from
<a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1133,6 +1078,9 @@ en:
to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
procedure</a> or file directly at our
<a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+ trademarks_title_html: <span id="trademarks"></span>Trademarks
+ trademarks_1_html: |
+ OpenStreetMap and the looking glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
welcome_page:
title: Welcome!
introduction_html: |
@@ -1156,7 +1104,7 @@ en:
editor_html: |
An <strong>editor</strong> is a program or website you can use to edit the map.
node_html: |
- A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.
+ A <strong>node</strong> is a point on the map, like a single restaurant or a tree.
way_html: |
A <strong>way</strong> is a line or area, like a road, stream, lake or building.
tag_html: |
@@ -1178,19 +1126,59 @@ en:
Just go to <a href='%{map_url}'>the map</a> and click the note icon:
<span class='icon note'></span>. This will add a marker to the map, which you can move
by dragging. Add your message, then click save, and other mappers will investigate.
+ fixthemap:
+ title: Report a problem / Fix the map
+ how_to_help:
+ title: How to Help
+ join_the_community:
+ title: Join the community
+ explanation_html: |
+ If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
+ proceed is to join the OpenStreetMap community and add or repair the data yourself.
+ add_a_note:
+ instructions_html: |
+ Just click <a class='icon note'></a> or the same icon on the map display.
+ This will add a marker to the map, which you can move
+ by dragging. Add your message, then click save, and other mappers will investigate.
+ other_concerns:
+ title: Other concerns
+ explanation_html: |
+ If you have concerns about how our data is being used or about the contents please consult our
+ <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
+ <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
help_page:
title: Getting Help
introduction: |
OpenStreetMap has several resources for learning about the project, asking and answering questions,
and collaboratively discussing and documenting mapping topics.
welcome:
- url: http://www.openstreetmap.org/welcome
+ url: /welcome
title: Welcome to OSM
description: Start with this quick guide covering the OpenStreetMap basics.
+ beginners_guide:
+ url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+ title: Beginners' Guide
+ description: Community maintained guide for beginners.
help:
url: https://help.openstreetmap.org/
title: help.openstreetmap.org
description: Ask a question or look up answers on OSM's question-and-answer site.
+ mailing_lists:
+ url: http://lists.openstreetmap.org/
+ title: Mailing Lists
+ description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
+ forums:
+ url: http://forum.openstreetmap.org/
+ title: Forums
+ description: Questions and discussions for those that prefer a bulletin board style interface.
+ irc:
+ url: http://irc.openstreetmap.org/
+ title: IRC
+ description: Interactive chat in many different languages and on many topics.
+ switch2osm:
+ url: https://switch2osm.org/
+ title: switch2osm
+ description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
wiki:
url: http://wiki.openstreetmap.org/
title: wiki.openstreetmap.org
@@ -1200,19 +1188,20 @@ en:
copyright_html: <span>©</span>OpenStreetMap<br>contributors
used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
lede_text: |
- OSM is built by a community of local mappers that keeps data about
- roads, cafés, subway stations, and much more up to date every day.
+ OpenStreetMap is built by a community of mappers that contribute and maintain data
+ about roads, trails, cafés, railway stations, and much more, all over the world.
local_knowledge_title: Local Knowledge
local_knowledge_html: |
OpenStreetMap emphasizes local knowledge. Contributors use
aerial imagery, GPS devices, and low-tech field maps to verify that OSM
- is up to date and accurate.
+ is accurate and up to date.
community_driven_title: Community Driven
community_driven_html: |
- From the engineers that tune OSM's servers to the Humanitarian OSM Team
- that maps disaster-affected areas, OSM's community is diverse,
- passionate, and growing every day. To learn more about the community,
- see the <a href='%{diary_path}'>user diaries</a>,
+ OpenStreetMap's community is diverse, passionate, and growing every day.
+ Our contributors include enthusiast mappers, GIS professionals, engineers
+ running the OSM servers, humanitarians mapping disaster-affected areas,
+ and many more.
+ To learn more about the community, see the <a href='%{diary_path}'>user diaries</a>,
<a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
open_data_title: Open Data
@@ -1222,26 +1211,15 @@ en:
build upon the data in certain ways, you may distribute the result only
under the same licence. See the <a href='%{copyright_path}'>Copyright and
License page</a> for details.
- photo_caption_0_html: |
- <a href='https://twitter.com/mikel'>@mikel</a> working on
- <a href='http://mapkibera.org/'>Map Kibera</a>, a project to map the
- largest slum in Nairobi, Kenya.
- <a href='http://www.flickr.com/photos/watato/4564778295'>© watato
- 2010</a>
- photo_caption_1_html: |
- <a href='https://twitter.com/lxbarth'>@lxbarth</a> and
- <a href='https://twitter.com/limareis'>@limareis</a> survey Brasilia with
- walking papers.
- <a href='http://www.flickr.com/photos/mapbox/7104560119'>© mapbox
- 2012</a>
- photo_caption_2_html: |
- @TODO caption (<a href='http://www.flickr.com/photos/oddwick/4775001075'>source</a>)
- photo_caption_3_html: |
- @TODO caption (<a href='http://www.flickr.com/photos/28698126@N02/3012439281'>source</a>)
- photo_caption_4_html: |
- @TODO caption (<a href='http://www.flickr.com/photos/louis_liu/4875155429/'>source</a>)
- photo_caption_5_html: |
- @TODO caption (<a href='http://www.flickr.com/photos/kachkaev/5793019627'>source</a>)
+ legal_title: Legal
+ legal_html: |
+ This site and many other related services are formally operated by the
+ <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+ on behalf of the community.
+ <br>
+ Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a>
+ if you have licensing, copyright or other legal questions and issues.
+ partners_title: Partners
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1318,6 +1296,16 @@ en:
your_note: "%{commenter} has reactivated one of your map notes near %{place}."
commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
details: "More details about the note can be found at %{url}."
+ changeset_comment_notification:
+ greeting: "Hi,"
+ commented:
+ subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
+ subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
+ your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}"
+ commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}"
+ partial_changeset_with_comment: "with comment '%{changeset_comment}'"
+ partial_changeset_without_comment: "without comment"
+ details: "More details about the changeset can be found at %{url}."
message:
inbox:
title: "Inbox"
@@ -1415,6 +1403,10 @@ en:
close: Close
search:
search: Search
+ get_directions: "Get directions"
+ get_directions_title: "Find directions between two points"
+ from: "From"
+ to: "To"
where_am_i: "Where am I?"
where_am_i_title: Describe the current location using the search engine
submit_text: "Go"
@@ -1621,6 +1613,7 @@ en:
need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
oauth:
oauthorize:
+ title: "Authorize access to your account"
request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
allow_to: "Allow the client application to:"
allow_read_prefs: "read your user preferences."
@@ -1630,6 +1623,14 @@ en:
allow_read_gpx: "read your private GPS traces."
allow_write_gpx: "upload GPS traces."
allow_write_notes: "modify notes."
+ oauthorize_success:
+ title: "Authorization request allowed"
+ allowed: "You have granted application %{app_name} access to your account."
+ verification: "The verification code is %{code}."
+ oauthorize_failure:
+ title: "Authorization request failed"
+ denied: "You have denied application %{app_name} access to your account."
+ invalid: "The authorization token is not valid."
revoke:
flash: "You've revoked the token for %{application}"
oauth_clients:
@@ -1703,7 +1704,7 @@ en:
login_button: "Login"
register now: Register now
with username: "Already have an OpenStreetMap account? Please login with your username and password:"
- with openid: "Alternatively, use OpenID to login:"
+ with external: "Alternatively, use a third party to login:"
new to osm: New to OpenStreetMap?
to make changes: To make changes to the OpenStreetMap data, you must have an account.
create account minute: Create an account. It only takes a minute.
@@ -1711,10 +1712,8 @@ en:
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 is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
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:
+ auth_providers:
openid:
title: Login with OpenID
alt: Login with an OpenID URL
@@ -1724,9 +1723,6 @@ en:
yahoo:
title: Login with Yahoo
alt: Login with a Yahoo OpenID
- myopenid:
- title: Login with myOpenID
- alt: Login with a myOpenID OpenID
wordpress:
title: Login with Wordpress
alt: Login with a Wordpress OpenID
@@ -1769,19 +1765,19 @@ en:
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:"
+ external auth: "Third Party Authentication:"
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: |
- <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
+ use external auth: "Alternatively, use a third party to login"
+ auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
+ auth association: |
+ <p>Your ID 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.
+ with your ID in your user settings.
</li>
</ul>
continue: Sign Up
@@ -1815,6 +1811,7 @@ en:
my edits: My Edits
my traces: My Traces
my notes: My Notes
+ my messages: My Messages
my profile: My Profile
my settings: My Settings
my comments: My Comments
@@ -1883,8 +1880,8 @@ en:
current email address: "Current Email Address:"
new email address: "New Email Address:"
email never displayed publicly: "(never displayed publicly)"
+ external auth: "External Authentication:"
openid:
- openid: "OpenID:"
link: "http://wiki.openstreetmap.org/wiki/OpenID"
link text: "what is this?"
public editing:
@@ -1936,6 +1933,7 @@ en:
Confirm your account by clicking on the link in the email and you'll be able to start mapping.
press confirm button: "Press the confirm button below to activate your account."
button: Confirm
+ success: "Confirmed your account, thanks for signing up!"
already active: "This account has already been confirmed."
unknown token: "That confirmation code has expired or does not exist."
reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
@@ -1946,8 +1944,9 @@ en:
heading: Confirm a change of email address
press confirm button: "Press the confirm button below to confirm your new email address."
button: Confirm
- success: "Confirmed your email address, thanks for signing up!"
+ success: "Confirmed your change of email address!"
failure: "An email address has already been confirmed with this token."
+ unknown_token: "That confirmation code has expired or does not exist."
set_home:
flash success: "Home location saved successfully"
go_public:
@@ -1989,6 +1988,9 @@ en:
This decision will be reviewed by an administrator shortly, or
you may contact the %{webmaster} if you wish to discuss this.
</p>
+ auth_failure:
+ connection_failed: Connection to authentication provider failed
+ invalid_credentials: Invalid authentication credentials
user_role:
filter:
not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
@@ -2173,33 +2175,77 @@ en:
overlays: Enable overlays for troubleshooting the map
title: "Layers"
copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
- donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Donate</a>"
+ donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
site:
edit_tooltip: Edit the map
edit_disabled_tooltip: Zoom in to edit the map
createnote_tooltip: Add a note to the map
createnote_disabled_tooltip: Zoom in to add a note to the map
+ map_notes_zoom_in_tooltip: Zoom in to see map notes
+ map_data_zoom_in_tooltip: Zoom in to see map data
+ queryfeature_tooltip: Query features
+ queryfeature_disabled_tooltip: Zoom in to query features
+ changesets:
+ show:
+ comment: "Comment"
+ subscribe: "Subscribe"
+ unsubscribe: "Unsubscribe"
+ hide_comment: "hide"
+ unhide_comment: "unhide"
notes:
new:
- intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
+ intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"
add: Add Note
show:
- permalink: Permalink
anonymous_warning: This note includes comments from anonymous users which should be independently verified.
- opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
- opened_by_anonymous: "created by anonymous at %{time}"
- commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
- commented_by_anonymous: "comment from anonymous at %{time}"
- closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
- closed_by_anonymous: "resolved by anonymous at %{time}"
- reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
- reopened_by_anonymous: "reactivated by anonymous at %{time}"
hide: Hide
resolve: Resolve
reactivate: Reactivate
comment_and_resolve: Comment & Resolve
comment: Comment
edit_help: Move the map and zoom in on a location you want to edit, then click here.
+ directions:
+ engines:
+ graphhopper_bicycle: "Bicycle (GraphHopper)"
+ graphhopper_foot: "Foot (GraphHopper)"
+ mapquest_bicycle: "Bicycle (MapQuest)"
+ mapquest_car: "Car (MapQuest)"
+ mapquest_foot: "Foot (MapQuest)"
+ osrm_car: "Car (OSRM)"
+ directions: "Directions"
+ distance: "Distance"
+ errors:
+ no_route: "Couldn't find a route between those two places."
+ no_place: "Sorry - couldn't find that place."
+ instructions:
+ continue_on: Continue on
+ slight_right: Slight right onto
+ turn_right: Turn right onto
+ sharp_right: Sharp right onto
+ uturn: U-turn along
+ sharp_left: Sharp left onto
+ turn_left: Turn left onto
+ slight_left: Slight left onto
+ via_point: (via point)
+ follow: Follow
+ roundabout: At roundabout take
+ leave_roundabout: Leave roundabout -
+ stay_roundabout: Stay on roundabout -
+ start: Start at end of
+ destination: Reach destination
+ against_oneway: Go against one-way on
+ end_oneway: End of one-way on
+ exit: exit %{exit}
+ unnamed: "(unnamed)"
+ courtesy: "Directions courtesy of %{link}"
+ time: "Time"
+ query:
+ node: Node
+ way: Way
+ relation: Relation
+ nothing_found: No features found
+ error: "Error contacting %{server}: %{error}"
+ timeout: "Timeout contacting %{server}"
redaction:
edit:
description: "Description"