X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cce0b8baf8485216b45342ec8d4b9109845bccf7..7a64ebe98265ff8ad6be5b8be9481661cd824f0f:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1f9a71870..7df06b277 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -230,7 +230,7 @@ en:
list:
title: "Changesets"
title_user: "Changesets by %{user}"
- title_friend: "Changesets by your friends"
+ title_friend: "Changesets by my friends"
title_nearby: "Changesets by nearby users"
empty: "No changesets found."
empty_area: "No changesets in this area."
@@ -259,7 +259,7 @@ en:
user_title: "%{user}'s diary"
in_language_title: "Diary Entries in %{language}"
new: New Diary Entry
- new_title: Compose a new entry in your user diary
+ new_title: Compose a new entry in my user diary
no_entries: No diary entries
recent_entries: "Recent diary entries"
older_entries: Older Entries
@@ -368,7 +368,6 @@ en:
search:
title:
latlon: 'Results from Internal'
- uk_postcode: 'Results from NPEMap / FreeThe Postcode'
ca_postcode: 'Results from Geocoder.CA'
osm_nominatim: 'Results from OpenStreetMap Nominatim'
geonames: 'Results from GeoNames'
@@ -382,12 +381,19 @@ en:
chair_lift: "Chair Lift"
drag_lift: "Drag Lift"
gondola: "Gondola Lift"
+ platter: "Platter Lift"
+ pylon: "Pylon"
station: "Aerialway Station"
+ t-bar: "T-Bar Lift"
aeroway:
aerodrome: "Aerodrome"
+ airstrip: "Airstrip"
apron: "Apron"
gate: "Gate"
+ hangar: "Hangar"
helipad: "Helipad"
+ holding_position: "Holding Position"
+ parking_position: "Parking Position"
runway: "Runway"
taxiway: "Taxiway"
terminal: "Terminal"
@@ -422,37 +428,32 @@ en:
crematorium: "Crematorium"
dentist: "Dentist"
doctors: "Doctors"
- dormitory: "Dormitory"
drinking_water: "Drinking Water"
driving_school: "Driving School"
embassy: "Embassy"
- emergency_phone: "Emergency Phone"
fast_food: "Fast Food"
ferry_terminal: "Ferry Terminal"
- fire_hydrant: "Fire Hydrant"
fire_station: "Fire Station"
food_court: "Food Court"
fountain: "Fountain"
fuel: "Fuel"
gambling: "Gambling"
grave_yard: "Grave Yard"
- gym: "Fitness Centre / Gym"
- health_centre: "Health Centre"
+ grit_bin: "Grit Bin"
hospital: "Hospital"
hunting_stand: "Hunting Stand"
ice_cream: "Ice Cream"
kindergarten: "Kindergarten"
library: "Library"
- market: "Market"
marketplace: "Marketplace"
monastery: "Monastery"
motorcycle_parking: "Motorcycle Parking"
nightclub: "Night Club"
- nursery: "Nursery"
nursing_home: "Nursing Home"
office: "Office"
parking: "Parking"
parking_entrance: "Parking Entrance"
+ parking_space: "Parking Space"
pharmacy: "Pharmacy"
place_of_worship: "Place of Worship"
police: "Police"
@@ -462,7 +463,6 @@ en:
prison: "Prison"
pub: "Pub"
public_building: "Public Building"
- reception_area: "Reception Area"
recycling: "Recycling Point"
restaurant: "Restaurant"
retirement_home: "Retirement Home"
@@ -487,6 +487,7 @@ en:
village_hall: "Village Hall"
waste_basket: "Waste Basket"
waste_disposal: "Waste Disposal"
+ water_point: "Water Point"
youth_centre: "Youth Centre"
boundary:
administrative: "Administrative Boundary"
@@ -495,6 +496,7 @@ en:
protected_area : "Protected Area"
bridge:
aqueduct: "Aqueduct"
+ boardwalk: "Boardwalk"
suspension: "Suspension Bridge"
swing: "Swing Bridge"
viaduct: "Viaduct"
@@ -514,25 +516,31 @@ en:
"yes": "Craft Shop"
emergency:
ambulance_station: "Ambulance Station"
+ assembly_point: "Assembly Point"
defibrillator: "Defibrillator"
landing_site: "Emergency Landing Site"
phone: "Emergency Phone"
+ water_tank: "Emergency Water Tank"
+ "yes": "Emergency"
highway:
abandoned: "Abandoned Highway"
bridleway: "Bridleway"
bus_guideway: "Guided Bus Lane"
bus_stop: "Bus Stop"
construction: "Highway under Construction"
+ corridor: "Corridor"
cycleway: "Cycle Path"
elevator: "Elevator"
emergency_access_point: "Emergency Access Point"
footway: "Footpath"
ford: "Ford"
+ give_way: "Give Way Sign"
living_street: "Living Street"
milestone: "Milestone"
motorway: "Motorway"
motorway_junction: "Motorway Junction"
motorway_link: "Motorway Road"
+ passing_place: "Passing Place"
path: "Path"
pedestrian: "Pedestrian Way"
platform: "Platform"
@@ -549,6 +557,7 @@ en:
services: "Motorway Services"
speed_camera: "Speed Camera"
steps: "Steps"
+ stop: "Stop Sign"
street_lamp: "Street Lamp"
tertiary: "Tertiary Road"
tertiary_link: "Tertiary Road"
@@ -557,8 +566,8 @@ en:
trail: "Trail"
trunk: "Trunk Road"
trunk_link: "Trunk Road"
+ turning_loop: "Turning Loop"
unclassified: "Unclassified Road"
- unsurfaced: "Unsurfaced Road"
"yes" : "Road"
historic:
archaeological_site: "Archaeological Site"
@@ -577,6 +586,7 @@ en:
manor: "Manor"
memorial: "Memorial"
mine: "Mine"
+ mine_shaft: "Mine Shaft"
monument: "Monument"
roman_road: "Roman Road"
ruins: "Ruins"
@@ -586,6 +596,7 @@ en:
wayside_cross: "Wayside Cross"
wayside_shrine: "Wayside Shrine"
wreck: "Wreck"
+ "yes": "Historic Site"
junction:
"yes": "Junction"
landuse:
@@ -623,9 +634,9 @@ en:
leisure:
beach_resort: "Beach Resort"
bird_hide: "Bird Hide"
- club: "Club"
common: "Common Land"
dog_park: "Dog Park"
+ firepit: "Fire Pit"
fishing: "Fishing Area"
fitness_centre: "Fitness Centre"
fitness_station: "Fitness Station"
@@ -650,15 +661,46 @@ en:
water_park: "Water Park"
"yes": "Leisure"
man_made:
+ adit: "Adit"
+ beacon: "Beacon"
+ beehive: "Bee Hive"
+ breakwater: "Breakwater"
+ bridge: "Bridge"
+ bunker_silo: "Bunker"
+ chimney: "Chimney"
+ crane: "Crane"
+ dolphin: "Mooring Post"
+ dyke: "Dyke"
+ embankment: "Embankment"
+ flagpole: "Flagpole"
+ gasometer: "Gasometer"
+ groyne: "Groyne"
+ kiln: "Kiln"
lighthouse: "Lighthouse"
+ mast: "Mast"
+ mine: "Mine"
+ mineshaft: "Mine Shaft"
+ monitoring_station: "Monitoring Station"
+ petroleum_well: "Petroleum Well"
+ pier: "Pier"
pipeline: "Pipeline"
+ silo: "Silo"
+ storage_tank: "Storage Tank"
+ surveillance: "Surveillance"
tower: "Tower"
+ wastewater_plant: "Wastewater Plant"
+ watermill: "Water Mill"
+ water_tower: "Water Tower"
+ water_well: "Well"
+ water_works: "Water Works"
+ windmill: "Wind Mill"
works: "Factory"
"yes": "Man-made"
military:
airfield: "Military Airfield"
barracks: "Barracks"
bunker: "Bunker"
+ "yes": "Military"
mountain_pass:
"yes" : "Mountain Pass"
natural:
@@ -704,11 +746,14 @@ en:
accountant: "Accountant"
administrative: "Administration"
architect: "Architect"
+ association: "Association"
company: "Company"
+ educational_institution: "Educational Institution"
employment_agency: "Employment Agency"
estate_agent: "Estate Agent"
government: "Governmental Office"
insurance: "Insurance Office"
+ it: "IT Office"
lawyer: "Lawyer"
ngo: "NGO Office"
telecommunication: "Telecommunication Office"
@@ -716,9 +761,8 @@ en:
"yes": "Office"
place:
allotments: "Allotments"
- block: "Block"
- airport: "Airport"
city: "City"
+ city_block: "City Block"
country: "Country"
county: "County"
farm: "Farm"
@@ -729,12 +773,13 @@ en:
islet: "Islet"
isolated_dwelling: "Isolated Dwelling"
locality: "Locality"
- moor: "Moor"
municipality: "Municipality"
neighbourhood: "Neighbourhood"
postcode: "Postcode"
+ quarter: "Quarter"
region: "Region"
sea: "Sea"
+ square: "Square"
state: "State"
subdivision: "Subdivision"
suburb: "Suburb"
@@ -746,10 +791,8 @@ en:
abandoned: "Abandoned Railway"
construction: "Railway under Construction"
disused: "Disused Railway"
- disused_station: "Disused Railway Station"
funicular: "Funicular Railway"
halt: "Train Stop"
- historic_station: "Historic Railway Station"
junction: "Railway Junction"
level_crossing: "Level Crossing"
light_rail: "Light Rail"
@@ -775,6 +818,7 @@ en:
beauty: "Beauty Shop"
beverages: "Beverages Shop"
bicycle: "Bicycle Shop"
+ bookmaker: "Bookmaker"
books: "Book Shop"
boutique: "Boutique"
butcher: "Butcher"
@@ -813,12 +857,16 @@ en:
hairdresser: "Hairdresser"
hardware: "Hardware Store"
hifi: "Hi-Fi"
- insurance: "Insurance"
+ houseware: "Houseware Shop"
+ interior_decoration: "Interior Decoration"
jewelry: "Jewelry Shop"
kiosk: "Kiosk Shop"
+ kitchen: "Kitchen Shop"
laundry: "Laundry"
+ lottery: "Lottery"
mall: "Mall"
market: "Market"
+ massage: "Massage"
mobile_phone: "Mobile Phone Shop"
motorcycle: "Motorcycle Shop"
music: "Music Shop"
@@ -826,21 +874,27 @@ en:
optician: "Optician"
organic: "Organic Food Shop"
outdoor: "Outdoor Shop"
+ paint: "Paint Shop"
+ pawnbroker: "Pawnbroker"
pet: "Pet Shop"
pharmacy: "Pharmacy"
photo: "Photo Shop"
- salon: "Salon"
+ seafood: "Sea Food"
second_hand: "Second-hand Shop"
shoes: "Shoe Shop"
- shopping_centre: "Shopping Centre"
sports: "Sports Shop"
stationery: "Stationery Shop"
supermarket: "Supermarket"
tailor: "Tailor"
+ ticket: "Ticket Shop"
+ tobacco: "Tobacco Shop"
toys: "Toy Shop"
travel_agency: "Travel Agency"
+ tyres: "Tyre Shop"
+ vacant: "Vacant Shop"
+ variety_store: "Variety Store"
video: "Video Shop"
- wine: "Off License"
+ wine: "Wine Store"
"yes": "Shop"
tourism:
alpine_hut: "Alpine Hut"
@@ -864,6 +918,7 @@ en:
viewpoint: "Viewpoint"
zoo: "Zoo"
tunnel:
+ building_passage: "Building Passage"
culvert: "Culvert"
"yes": "Tunnel"
waterway:
@@ -1114,8 +1169,8 @@ en:
paragraph_1_html: |
OpenStreetMap has few formal rules but we expect all participants to collaborate
with, and communicate with, the community. If you are considering
- any activities other than editing by hand, please read and follow the guidelines on
- Imports and
+ any activities other than editing by hand, please read and follow the guidelines on
+ Imports and
Automated Edits.
questions:
title: Any questions?
@@ -1141,7 +1196,7 @@ en:
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.
+ proceed is to join the OpenStreetMap community and add or repair the data yourself.
add_a_note:
instructions_html: |
Just click or the same icon on the map display.
@@ -1151,8 +1206,8 @@ en:
title: Other concerns
explanation_html: |
If you have concerns about how our data is being used or about the contents please consult our
- copyright page for more legal information, or contact the appropriate
- OSMF working group.
+ copyright page for more legal information, or contact the appropriate
+ OSMF working group.
help_page:
title: Getting Help
introduction: |
@@ -1222,16 +1277,16 @@ en:
License page for details.
legal_title: Legal
legal_html: |
- This site and many other related services are formally operated by the
- OpenStreetMap Foundation (OSMF)
- on behalf of the community. Use of all OSMF operated services is subject
+ This site and many other related services are formally operated by the
+ OpenStreetMap Foundation (OSMF)
+ on behalf of the community. Use of all OSMF operated services is subject
to our
Acceptable Use Policies and our Privacy Policy
-
- Please contact the OSMF
+
+ Please contact the OSMF
if you have licensing, copyright or other legal questions.
- OpenStreetMap, the magnifiying glass logo and State of the Map are registered trademarks of the OSMF.
+ OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF.
partners_title: Partners
notifier:
diary_comment_notification:
@@ -1427,6 +1482,7 @@ en:
where_am_i: "Where is this?"
where_am_i_title: Describe the current location using the search engine
submit_text: "Go"
+ reverse_directions_text: "Reverse Directions"
key:
table:
entry:
@@ -1555,7 +1611,7 @@ en:
trace_header:
upload_trace: "Upload a trace"
see_all_traces: "See all traces"
- see_your_traces: "See your traces"
+ see_my_traces: "See my traces"
traces_waiting:
one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
@@ -1580,6 +1636,7 @@ en:
delete_track: "Delete this trace"
trace_not_found: "Trace not found!"
visibility: "Visibility:"
+ confirm_delete: "Delete this trace?"
trace_paging_nav:
showing_page: "Page %{page}"
older: "Older Traces"
@@ -1602,9 +1659,9 @@ en:
map: "map"
list:
public_traces: "Public GPS traces"
- your_traces: "Your GPS traces"
+ my_traces: "My GPS traces"
public_traces_from: "Public GPS traces from %{user}"
- description: "Browse recent GPS track uploads"
+ description: "Browse recent GPS trace uploads"
tagged_with: " tagged with %{tags}"
empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page."
delete:
@@ -1867,7 +1924,7 @@ en:
user location: User location
if set location: "Set your home location on the %{settings_link} page to see nearby users."
settings_link_text: settings
- your friends: Your friends
+ my friends: My friends
no friends: You have not added any friends yet.
km away: "%{count}km away"
m away: "%{count}m away"
@@ -2269,12 +2326,23 @@ en:
distance: "Distance"
errors:
no_route: "Couldn't find a route between those two places."
- no_place: "Sorry - couldn't find that place."
+ no_place: "Sorry - couldn't locate '%{place}'."
instructions:
continue_without_exit: Continue on %{name}
slight_right_without_exit: Slight right onto %{name}
- offramp_right_without_exit: Take the ramp on the right onto %{name}
+ offramp_right: Take the ramp on the right
+ offramp_right_with_exit: Take exit %{exit} on the right
+ offramp_right_with_exit_name: Take exit %{exit} on the right onto %{name}
+ offramp_right_with_exit_directions: Take exit %{exit} on the right towards %{directions}
+ offramp_right_with_exit_name_directions: Take exit %{exit} on the right onto %{name}, towards %{directions}
+ offramp_right_with_name: Take the ramp on the right onto %{name}
+ offramp_right_with_directions: Take the ramp on the right towards %{directions}
+ offramp_right_with_name_directions: Take the ramp on the right onto %{name}, towards %{directions}
onramp_right_without_exit: Turn right on the ramp onto %{name}
+ onramp_right_with_directions: Turn right onto the ramp towards %{directions}
+ onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions}
+ onramp_right_without_directions: Turn right onto the ramp
+ onramp_right: Turn right onto the ramp
endofroad_right_without_exit: At the end of the road turn right onto %{name}
merge_right_without_exit: Merge right onto %{name}
fork_right_without_exit: At the fork turn right onto %{name}
@@ -2283,18 +2351,29 @@ en:
uturn_without_exit: U-turn along %{name}
sharp_left_without_exit: Sharp left onto %{name}
turn_left_without_exit: Turn left onto %{name}
- offramp_left_without_exit: Take the ramp on the left onto %{name}
+ offramp_left: Take the ramp on the left
+ offramp_left_with_exit: Take exit %{exit} on the left
+ offramp_left_with_exit_name: Take exit %{exit} on the left onto %{name}
+ offramp_left_with_exit_directions: Take exit %{exit} on the left towards %{directions}
+ offramp_left_with_exit_name_directions: Take exit %{exit} on the left onto %{name}, towards %{directions}
+ offramp_left_with_name: Take the ramp on the left onto %{name}
+ offramp_left_with_directions: Take the ramp on the left towards %{directions}
+ offramp_left_with_name_directions: Take the ramp on the left onto %{name}, towards %{directions}
onramp_left_without_exit: Turn left on the ramp onto %{name}
+ onramp_left_with_directions: Turn left onto the ramp towards %{directions}
+ onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions}
+ onramp_left_without_directions: Turn left onto the ramp
+ onramp_left: Turn left onto the ramp
endofroad_left_without_exit: At the end of the road turn left onto %{name}
merge_left_without_exit: Merge left onto %{name}
fork_left_without_exit: At the fork turn left onto %{name}
slight_left_without_exit: Slight left onto %{name}
via_point_without_exit: (via point)
follow_without_exit: Follow %{name}
- roundabout_without_exit: At roundabout take %{name}
+ roundabout_without_exit: At roundabout take exit onto %{name}
leave_roundabout_without_exit: Leave roundabout - %{name}
stay_roundabout_without_exit: Stay on roundabout - %{name}
- start_without_exit: Start at end of %{name}
+ start_without_exit: Start on %{name}
destination_without_exit: Reach destination
against_oneway_without_exit: Go against one-way on %{name}
end_oneway_without_exit: End of one-way on %{name}