X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e45f8855c4af1284f9113e8346907528314ff546..dc48c9a5101c263dfd0eb33fa358490fc2ad9de0:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b5cfba61b..1cec3f148 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -392,14 +392,21 @@ en:
all:
title: "OpenStreetMap diary entries"
description: "Recent diary entries from users of OpenStreetMap"
+ comments:
+ has_commented_on: "%{display_name} has commented on the following diary entries"
+ post: Post
+ when: When
+ comment: Comment
+ ago: %{ago} ago
+ newer_comments: "Newer Comments"
+ older_comments: "Older Comments"
export:
start:
area_to_export: "Area to Export"
manually_select: "Manually select a different area"
format_to_export: "Format to Export"
osm_xml_data: "OpenStreetMap XML Data"
- mapnik_image: "Mapnik Image"
- osmarender_image: "Osmarender Image"
+ map_image: "Map Image (shows standard layer)"
embeddable_html: "Embeddable HTML"
licence: "Licence"
export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.'
@@ -444,16 +451,27 @@ en:
search_osm_nominatim:
prefix_format: "%{name}"
prefix:
+ aeroway:
+ aerodrome: "Aerodrome"
+ apron: "Apron"
+ gate: "Gate"
+ helipad: "Helipad"
+ runway: "Runway"
+ taxiway: "Taxiway"
+ terminal: "Terminal"
amenity:
airport: "Airport"
arts_centre: "Arts Centre"
+ artwork: "Artwork"
atm: "ATM"
auditorium: "Auditorium"
bank: "Bank"
bar: "Bar"
+ bbq: "BBQ"
bench: "Bench"
bicycle_parking: "Cycle Parking"
bicycle_rental: "Cycle Rental"
+ biergarten: "Beer Garden"
brothel: "Brothel"
bureau_de_change: "Bureau de Change"
bus_station: "Bus Station"
@@ -462,6 +480,7 @@ en:
car_sharing: "Car Sharing"
car_wash: "Car Wash"
casino: "Casino"
+ charging_station: "Charging Station"
cinema: "Cinema"
clinic: "Clinic"
club: "Club"
@@ -480,6 +499,7 @@ en:
ferry_terminal: "Ferry Terminal"
fire_hydrant: "Fire Hydrant"
fire_station: "Fire Station"
+ food_court: "Food Court"
fountain: "Fountain"
fuel: "Fuel"
grave_yard: "Grave Yard"
@@ -520,9 +540,12 @@ en:
shelter: "Shelter"
shop: "Shop"
shopping: "Shopping"
+ shower: "Shower"
+ social_centre: "Social Centre"
social_club: "Social Club"
studio: "Studio"
supermarket: "Supermarket"
+ swimming_pool: "Swimming Pool"
taxi: "Taxi"
telephone: "Public Telephone"
theatre: "Theatre"
@@ -534,41 +557,21 @@ en:
village_hall: "Village Hall"
waste_basket: "Waste Basket"
wifi: "WiFi Access"
+ WLAN: "WiFi Access"
youth_centre: "Youth Centre"
boundary:
administrative: "Administrative Boundary"
+ census: "Census Boundary"
+ national_park: "National Park"
+ protected_area : "Protected Area"
+ bridge:
+ aqueduct: "Aqueduct"
+ suspension: "Suspension Bridge"
+ swing: "Swing Bridge"
+ viaduct: "Viaduct"
+ "yes": "Bridge"
building:
- apartments: "Apartment Block"
- block: "Building Block"
- bunker: "Bunker"
- chapel: "Chapel"
- church: "Church"
- city_hall: "City Hall"
- commercial: "Commercial Building"
- dormitory: "Dormitory"
- entrance: "Building Entrance"
- faculty: "Faculty Building"
- farm: "Farm Building"
- flats: "Flats"
- garage: "Garage"
- hall: "Hall"
- hospital: "Hospital Building"
- hotel: "Hotel"
- house: "House"
- industrial: "Industrial Building"
- office: "Office Building"
- public: "Public Building"
- residential: "Residential Building"
- retail: "Retail Building"
- school: "School Building"
- shop: "Shop"
- stadium: "Stadium"
- store: "Store"
- terrace: "Terrace"
- tower: "Tower"
- train_station: "Railway Station"
- university: "University Building"
- yes: "Building"
+ "yes": "Building"
highway:
bridleway: "Bridleway"
bus_guideway: "Guided Bus Lane"
@@ -576,12 +579,11 @@ en:
byway: "Byway"
construction: "Highway under Construction"
cycleway: "Cycle Path"
- distance_marker: "Distance Marker"
emergency_access_point: "Emergency Access Point"
footway: "Footpath"
ford: "Ford"
- gate: "Gate"
living_street: "Living Street"
+ milestone: "Milestone"
minor: "Minor Road"
motorway: "Motorway"
motorway_junction: "Motorway Junction"
@@ -593,14 +595,17 @@ en:
primary_link: "Primary Road"
raceway: "Raceway"
residential: "Residential"
+ rest_area: "Rest Area"
road: "Road"
secondary: "Secondary Road"
secondary_link: "Secondary Road"
service: "Service Road"
services: "Motorway Services"
+ speed_camera: "Speed Camera"
steps: "Steps"
stile: "Stile"
tertiary: "Tertiary Road"
+ tertiary_link: "Tertiary Road"
track: "Track"
trail: "Trail"
trunk: "Trunk Road"
@@ -614,6 +619,7 @@ en:
building: "Building"
castle: "Castle"
church: "Church"
+ fort: "Fort"
house: "House"
icon: "Icon"
manor: "Manor"
@@ -638,6 +644,7 @@ en:
farmland: "Farmland"
farmyard: "Farmyard"
forest: "Forest"
+ garages: "Garages"
grass: "Grass"
greenfield: "Greenfield Land"
industrial: "Industrial Area"
@@ -645,25 +652,28 @@ en:
meadow: "Meadow"
military: "Military Area"
mine: "Mine"
- mountain: "Mountain"
+ orchard: "Orchard"
nature_reserve: "Nature Reserve"
park: "Park"
piste: "Piste"
- plaza: "Plaza"
quarry: "Quarry"
railway: "Railway"
recreation_ground: "Recreation Ground"
reservoir: "Reservoir"
+ reservoir_watershed: "Reservoir Watershed"
residential: "Residential Area"
retail: "Retail"
+ road: "Road Area"
village_green: "Village Green"
vineyard: "Vineyard"
wetland: "Wetland"
wood: "Wood"
leisure:
beach_resort: "Beach Resort"
+ bird_hide: "Bird Hide"
common: "Common Land"
fishing: "Fishing Area"
+ fitness_station: "Fitness Station"
garden: "Garden"
golf_course: "Golf Course"
ice_rink: "Ice Rink"
@@ -674,12 +684,17 @@ en:
pitch: "Sports Pitch"
playground: "Playground"
recreation_ground: "Recreation Ground"
+ sauna: "Sauna"
slipway: "Slipway"
sports_centre: "Sports Centre"
stadium: "Stadium"
swimming_pool: "Swimming Pool"
track: "Running Track"
water_park: "Water Park"
+ military:
+ airfield: "Military Airfield"
+ barracks: "Barracks"
+ bunker: "Bunker"
natural:
bay: "Bay"
beach: "Beach"
@@ -687,11 +702,12 @@ en:
cave_entrance: "Cave Entrance"
channel: "Channel"
cliff: "Cliff"
- coastline: "Coastline"
crater: "Crater"
+ dune: "Dune"
feature: "Feature"
fell: "Fell"
fjord: "Fjord"
+ forest: "Forest"
geyser: "Geyser"
glacier: "Glacier"
heath: "Heath"
@@ -711,6 +727,7 @@ en:
scrub: "Scrub"
shoal: "Shoal"
spring: "Spring"
+ stone: "Stone"
strait: "Strait"
tree: "Tree"
valley: "Valley"
@@ -719,6 +736,19 @@ en:
wetland: "Wetland"
wetlands: "Wetlands"
wood: "Wood"
+ office:
+ accountant: "Accountant"
+ architect: "Architect"
+ company: "Company"
+ employment_agency: "Employment Agency"
+ estate_agent: "Estate Agent"
+ government: "Governmental Office"
+ insurance: "Insurance Office"
+ lawyer: "Lawyer"
+ ngo: "NGO Office"
+ telecommunication: "Telecommunication Office"
+ travel_agent: "Travel Agency"
+ "yes": "Office"
place:
airport: "Airport"
city: "City"
@@ -730,6 +760,7 @@ en:
houses: "Houses"
island: "Island"
islet: "Islet"
+ isolated_dwelling: "Isolated Dwelling"
locality: "Locality"
moor: "Moor"
municipality: "Municipality"
@@ -753,6 +784,7 @@ en:
junction: "Railway Junction"
level_crossing: "Level Crossing"
light_rail: "Light Rail"
+ miniature: "Miniature Rail"
monorail: "Monorail"
narrow_gauge: "Narrow Gauge Railway"
platform: "Railway Platform"
@@ -767,7 +799,7 @@ en:
yard: "Railway Yard"
shop:
alcohol: "Off License"
- apparel: "Apparel Shop"
+ antiques: "Antiques"
art: "Art Shop"
bakery: "Bakery"
beauty: "Beauty Shop"
@@ -776,7 +808,6 @@ en:
books: "Book Shop"
butcher: "Butcher"
car: "Car Shop"
- car_dealer: "Car Dealer"
car_parts: "Car Parts"
carpet: "Carpet Shop"
car_repair: "Car Repair"
@@ -791,7 +822,6 @@ en:
department_store: "Department Store"
discount: "Discount Items Shop"
doityourself: "Do-It-Yourself"
- drugstore: "Drugstore"
dry_cleaning: "Dry Cleaning"
electronics: "Electronics Shop"
estate_agent: "Estate Agent"
@@ -857,7 +887,10 @@ en:
valley: "Valley"
viewpoint: "Viewpoint"
zoo: "Zoo"
+ tunnel:
+ "yes": "Tunnel"
waterway:
+ artificial: "Artificial Waterway"
boatyard: "Boatyard"
canal: "Canal"
connector: "Waterway Connector"
@@ -940,14 +973,19 @@ en:
user_diaries_tooltip: View user diaries
edit_with: Edit with %{editor}
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 %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}."
- intro_3_ucl: "the UCL VR Centre"
- intro_3_ic: "Imperial College London"
- intro_3_bytemark: "Bytemark Hosting"
- intro_3_partners: "wiki"
- intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
+ intro_1: "OpenStreetMap is a free worldwide map, created by people like you."
+ intro_2: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
+ intro_2_create_account: "Create a user account"
+ intro_2_license: "open license"
+ intro_2_use: "use"
+ intro_2_download: "download"
+ intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"
+ partners: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
+ partners_ucl: "the UCL VR Centre"
+ partners_ic: "Imperial College London"
+ partners_bytemark: "Bytemark Hosting"
+ partners_partners: "partners"
+ 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."
@@ -962,6 +1000,7 @@ en:
documentation: Documentation
documentation_title: Documentation for the project
copyright: "Copyright & License"
+ community: Community
community_blogs: "Community Blogs"
community_blogs_title: "Blogs from members of the OpenStreetMap community"
foundation: Foundation
@@ -1547,7 +1586,7 @@ en:
email or username: "Email Address or Username:"
password: "Password:"
openid: "%{logo} OpenID:"
- remember: "Remember me:"
+ remember: "Remember me"
lost password link: "Lost your password?"
login_button: "Login"
register now: Register now
@@ -1556,6 +1595,7 @@ en:
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.
+ no account: Don't have an account?
account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email."
account is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the webmaster if you wish to discuss this.
auth failure: "Sorry, could not log in with those details."
@@ -1662,6 +1702,7 @@ en:
my edits: my edits
my traces: my traces
my settings: my settings
+ my comments: my comments
oauth settings: oauth settings
blocks on me: blocks on me
blocks by me: blocks by me
@@ -1703,6 +1744,7 @@ en:
moderator: "Revoke moderator access"
block_history: "view blocks received"
moderator_history: "view blocks given"
+ comments: "comments"
create_block: "block this user"
activate_user: "activate this user"
deactivate_user: "deactivate this user"
@@ -1931,8 +1973,7 @@ en:
javascripts:
map:
base:
- mapnik: Mapnik
- osmarender: Osmarender
+ standard: Standard
cycle_map: Cycle Map
transport_map: Transport Map
mapquest: MapQuest Open