X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/503446c0fbbd9663f35198823f147e3b108aed37..b598979374985b8c62fac14588d685e29eac20a4:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index db644920e..dd8815329 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -121,11 +121,17 @@ en:
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}"
+ join_discussion: "Log in to join the discussion"
+ discussion: Discussion
+ report: Report this changeset?
node:
title: "Node: %{name}"
history_title: "Node History: %{name}"
@@ -157,6 +163,7 @@ en:
way: way
relation: relation
changeset: changeset
+ note: note
timeout:
sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
type:
@@ -164,6 +171,7 @@ en:
way: way
relation: relation
changeset: changeset
+ note: note
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."
@@ -180,7 +188,9 @@ en:
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"
+ telephone_link: "Call %{phone_number}"
note:
title: "Note: %{id}"
new_note: "New Note"
@@ -197,6 +207,12 @@ en:
reopened_by: "Reactivated by %{user} %{when} ago"
reopened_by_anonymous: "Reactivated by anonymous %{when} ago"
hidden_by: "Hidden by %{user} %{when} ago"
+ report: Report this note?
+ 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}"
@@ -226,9 +242,17 @@ en:
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
+ publish_button: "Publish"
list:
title: "Users' diaries"
title_friends: "Friends' diaries"
@@ -274,10 +298,12 @@ en:
edit_link: Edit this entry
hide_link: Hide this entry
confirm: Confirm
+ report: Report this entry?
diary_comment:
comment_from: "Comment from %{link_user} on %{comment_created_at}"
hide_link: Hide this comment
confirm: Confirm
+ report: Report this comment?
location:
location: "Location:"
view: "View"
@@ -356,8 +382,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"
@@ -368,11 +396,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"
@@ -380,6 +406,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"
@@ -389,9 +416,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"
@@ -410,25 +438,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"
@@ -438,7 +466,6 @@ en:
prison: "Prison"
pub: "Pub"
public_building: "Public Building"
- public_market: "Public Market"
reception_area: "Reception Area"
recycling: "Recycling Point"
restaurant: "Restaurant"
@@ -447,13 +474,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"
@@ -465,8 +490,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"
@@ -481,22 +505,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"
@@ -507,7 +544,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"
@@ -517,37 +554,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"
@@ -569,9 +613,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"
@@ -582,16 +623,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"
@@ -600,6 +644,7 @@ en:
pitch: "Sports Pitch"
playground: "Playground"
recreation_ground: "Recreation Ground"
+ resort: "Resort"
sauna: "Sauna"
slipway: "Slipway"
sports_centre: "Sports Centre"
@@ -607,6 +652,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"
@@ -618,16 +670,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"
@@ -639,11 +690,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"
@@ -652,10 +703,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"
@@ -668,6 +719,8 @@ en:
travel_agent: "Travel Agency"
"yes": "Office"
place:
+ allotments: "Allotments"
+ block: "Block"
airport: "Airport"
city: "City"
country: "Country"
@@ -692,6 +745,7 @@ en:
town: "Town"
unincorporated_area: "Unincorporated Area"
village: "Village"
+ "yes": "Place"
railway:
abandoned: "Abandoned Railway"
construction: "Railway under Construction"
@@ -712,12 +766,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"
@@ -796,6 +849,7 @@ en:
"yes": "Shop"
tourism:
alpine_hut: "Alpine Hut"
+ apartment: "Apartment"
artwork: "Artwork"
attraction: "Attraction"
bed_and_breakfast: "Bed and Breakfast"
@@ -803,16 +857,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:
@@ -822,7 +875,6 @@ en:
artificial: "Artificial Waterway"
boatyard: "Boatyard"
canal: "Canal"
- connector: "Waterway Connector"
dam: "Dam"
derelict_canal: "Derelict Canal"
ditch: "Ditch"
@@ -830,16 +882,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"
@@ -859,19 +909,118 @@ 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"
+ issues:
+ report: Report
+ resolve: Resolve
+ ignore: Ignore
+ reopen: Reopen
+ index:
+ search:
+ user_not_found: User does not exist
+ issues_not_found: No such issues found
+ create:
+ successful_report: Your report has been registered sucessfully
+ provide_details: Please provide the required details
+ update:
+ new_report: Your report been registered sucessfully
+ successful_update: Your report has been updated successfully
+ provide_details: Please provide the required details
+ new:
+ details: Please provide some more details into the problem. (This field cannot be left blank!)
+ select: Select a reason for your report
+ disclaimer:
+ placeholder: Please make sure you have done the below before submitting a report
+ placeholder1: Placeholder 1
+ placeholder2: Placeholder 2
+ placeholder3: Placeholder 3
+ show:
+ comments:
+ reassign: The Issue was reassigned
+ reassign_param: Reassign Issue?
+ comment:
+ provide_details: Please provide the required details
+ comment_created: Your comment was successfully created
+ resolved: Issue status has been set to 'Resolved'
+ ignored: Issue status has been set to 'Ignored'
+ reopened: Issue status has been set to 'Open'
+ report_strings:
+ DiaryEntry:
+ spam:
+ type: "[SPAM]"
+ details: This Diary Entry is/contains spam
+ offensive:
+ type: "[OFFENSIVE]"
+ details: This Diary Entry is obscene/offensive
+ threat:
+ type: "[THREAT]"
+ details: This Diary Entry contains a threat
+ other:
+ type: "[OTHER]"
+ details: Other
+ DiaryComment:
+ spam:
+ type: "[SPAM]"
+ details: This Diary Comment is/contains spam
+ offensive:
+ type: "[OFFENSIVE]"
+ details: This Diary Comment is obscene/offensive
+ threat:
+ type: "[THREAT]"
+ details: This Diary Comment contains a threat
+ other:
+ type: "[OTHER]"
+ details: Other
+ User:
+ spam:
+ type: "[SPAM]"
+ details: This User profile is/contains spam
+ offensive:
+ type: "[OFFENSIVE]"
+ details: This User profile is obscene/offensive
+ threat:
+ type: "[THREAT]"
+ details: This User profile contains a threat
+ vandal:
+ type: "[VANDAL]"
+ details: This User is a vandal
+ other:
+ type: "[OTHER]"
+ details: Other
+ Changeset:
+ undiscussed_import:
+ type: "[UNDISCUSSED-IMPORT]"
+ details: This changeset is an undiscussed import
+ mechanical_edit:
+ type: "[MECH-EDIT]"
+ details: This changeset is a mechanical edit
+ edit_error:
+ type: "[EDIT-ERROR]"
+ details: This changeset contains a newbie or an editor error
+ spam:
+ type: "[SPAM]"
+ details: This changeset is/contains spam
+ vandalism:
+ type: "[VANDALISM]"
+ details: This changeset is/contains vandalism
+ other:
+ type: "[OTHER]"
+ details: Other
+ Note:
+ spam:
+ type: "[SPAM]"
+ details: This note is spam
+ vandalism:
+ type: "[VANDALISM]"
+ details: This note is vandalism
+ personal:
+ type: "[PERSONAL]"
+ details: This note contains personal data
+ abusive:
+ type: "[ABUSIVE]"
+ details: This note is abusive
+ other:
+ type: "[OTHER]"
+ details: Other
layouts:
project_name:
# in
@@ -890,6 +1039,7 @@ en:
edit: Edit
history: History
export: Export
+ reports: Reports
data: Data
export_data: Export Data
gps_traces: GPS Traces
@@ -936,9 +1086,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
@@ -974,6 +1125,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: |
@@ -1013,6 +1165,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:
@@ -1041,6 +1198,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, the magnifying glass logo and State of the Map 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: |
@@ -1070,6 +1230,14 @@ en:
tag_html: |
A <strong>tag</strong> is a bit of data about a node or way, like a
restaurant's name or a road's speed limit.
+ rules:
+ title: Rules!
+ 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
+ <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
+ <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
questions:
title: Any questions?
paragraph_1_html: |
@@ -1115,10 +1283,30 @@ en:
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
@@ -1126,7 +1314,7 @@ en:
about_page:
next: Next
copyright_html: <span>©</span>OpenStreetMap<br>contributors
- used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
+ used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
lede_text: |
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.
@@ -1151,6 +1339,14 @@ 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.
+ 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:
@@ -1228,6 +1424,20 @@ 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}."
+ new_issue_notification:
+ subject: "[OpenStreetMap] New Issue"
+ greeting: "Hi,"
+ new_issue: "A new issue has been created"
message:
inbox:
title: "Inbox"
@@ -1325,6 +1535,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"
@@ -1332,15 +1546,17 @@ en:
table:
entry:
motorway: "Motorway"
+ main_road: "Main road"
trunk: "Trunk road"
primary: "Primary road"
secondary: "Secondary road"
unclassified: "Unclassified road"
- unsurfaced: "Unsurfaced road"
track: "Track"
- byway: "Byway"
bridleway: "Bridleway"
cycleway: "Cycleway"
+ cycleway_national: "National cycleway"
+ cycleway_regional: "Regional cycleway"
+ cycleway_local: "Local cycleway"
footway: "Footway"
rail: "Railway"
subway: "Subway"
@@ -1362,7 +1578,6 @@ en:
golf: "Golf course"
park: "Park"
resident: "Residential area"
- tourist: "Tourist attraction"
common:
- Common
- meadow
@@ -1392,9 +1607,11 @@ en:
tunnel: "Dashed casing = tunnel"
bridge: "Black casing = bridge"
private: "Private access"
- permissive: "Permissive access"
destination: "Destination access"
construction: "Roads under construction"
+ bicycle_shop: "Bicycle shop"
+ bicycle_parking: "Bicycle parking"
+ toilets: "Toilets"
richtext_area:
edit: Edit
preview: Preview
@@ -1524,6 +1741,8 @@ en:
application:
require_cookies:
cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
+ require_admin:
+ not_an_admin: You need to be an admin to perform that action.
require_moderator:
not_a_moderator: "You need to be a moderator to perform that action."
setup_user_auth:
@@ -1541,6 +1760,7 @@ en:
allow_read_gpx: "read your private GPS traces."
allow_write_gpx: "upload GPS traces."
allow_write_notes: "modify notes."
+ grant_access: "Grant Access"
oauthorize_success:
title: "Authorization request allowed"
allowed: "You have granted application %{app_name} access to your account."
@@ -1622,7 +1842,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.
@@ -1630,22 +1850,26 @@ 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
google:
title: Login with Google
alt: Login with a Google OpenID
+ facebook:
+ title: Login with Facebook
+ alt: Login with a Facebook Account
+ windowslive:
+ title: Login with Windows Live
+ alt: Login with a Windows Live Account
+ github:
+ title: Login with GitHub
+ alt: Login with a GitHub Account
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
@@ -1675,7 +1899,7 @@ en:
new:
title: "Sign Up"
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
- contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+ contact_webmaster: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
about:
header: Free and editable
html: |
@@ -1688,21 +1912,11 @@ 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>
- <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.
- </li>
- </ul>
+ 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."
continue: Sign Up
terms accepted: "Thanks for accepting the new contributor terms!"
terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
@@ -1728,6 +1942,7 @@ en:
title: "No such user"
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."
+ deleted: "deleted"
view:
my diary: My Diary
new diary entry: new diary entry
@@ -1778,21 +1993,22 @@ en:
revoke:
administrator: "Revoke administrator access"
moderator: "Revoke moderator access"
- block_history: "blocks received"
- moderator_history: "blocks given"
+ block_history: "Active Blocks"
+ moderator_history: "Blocks Given"
comments: "Comments"
- create_block: "block this user"
- activate_user: "activate this user"
- deactivate_user: "deactivate this user"
- confirm_user: "confirm this user"
- hide_user: "hide this user"
- unhide_user: "unhide this user"
- delete_user: "delete this user"
+ create_block: "Block this User"
+ activate_user: "Activate this User"
+ deactivate_user: "Deactivate this User"
+ confirm_user: "Confirm this User"
+ hide_user: "Hide this User"
+ unhide_user: "Unhide this User"
+ delete_user: "Delete this User"
confirm: "Confirm"
friends_changesets: "friends' changesets"
friends_diaries: "friends' diary entries"
nearby_changesets: "nearby user changesets"
nearby_diaries: "nearby user diary entries"
+ report: "Report this user?"
popup:
your location: "Your location"
nearby mapper: "Nearby mapper"
@@ -1803,8 +2019,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:
@@ -1833,6 +2049,8 @@ en:
gravatar: "Use Gravatar"
link: "http://wiki.openstreetmap.org/wiki/Gravatar"
link text: "what is this?"
+ disabled: "Gravatar has been disabled."
+ enabled: "Display of your Gravatar has been enabled."
new image: "Add an image"
keep image: "Keep the current image"
delete image: "Remove the current image"
@@ -1856,18 +2074,20 @@ 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>."
confirm_resend:
- success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />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."
+ success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
failure: "User %{name} not found."
confirm_email:
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:
@@ -1909,6 +2129,21 @@ 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
+ no_authorization_code: No authorization code
+ unknown_signature_algorithm: Unknown signature algorithm
+ invalid_scope: Invalid scope
+ auth_association:
+ heading: Your ID is not associated with a OpenStreetMap account yet.
+ option_1: |
+ If you are new to OpenStreetMap, please create a new account
+ using the form below.
+ option_2: |
+ If you already have an account, you can login to your account
+ using your username and password and then associate the account
+ with your ID in your user settings.
user_role:
filter:
not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
@@ -2009,6 +2244,8 @@ en:
heading: "%{block_on} blocked by %{block_by}"
time_future: "Ends in %{time}"
time_past: "Ended %{time} ago"
+ created: "Created"
+ ago: "%{time} ago"
status: "Status"
show: "Show"
edit: "Edit"
@@ -2058,6 +2295,7 @@ en:
link: "Link or HTML"
long_link: "Link"
short_link: "Short Link"
+ geo_uri: "Geo URI"
embed: "HTML"
custom_dimensions: "Set custom dimensions"
format: "Format:"
@@ -2069,6 +2307,9 @@ en:
center_marker: "Center map on marker"
paste_html: "Paste HTML to embed in website"
view_larger_map: "View Larger Map"
+ only_standard_layer: "Only the standard layer can be exported as an image"
+ embed:
+ report_problem: "Report a problem"
key:
title: "Map Key"
tooltip: "Map Key"
@@ -2084,7 +2325,6 @@ en:
standard: Standard
cycle_map: Cycle Map
transport_map: Transport Map
- mapquest: MapQuest Open
hot: Humanitarian
layers:
header: Map Layers
@@ -2101,6 +2341,15 @@ en:
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: "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.)"
@@ -2113,6 +2362,61 @@ en:
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)"
+ mapzen_bicycle: "Bicycle (Mapzen)"
+ mapzen_car: "Car (Mapzen)"
+ mapzen_foot: "Foot (Mapzen)"
+ 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_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}
+ onramp_right_without_exit: Turn right on the ramp onto %{name}
+ 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}
+ turn_right_without_exit: Turn right onto %{name}
+ sharp_right_without_exit: Sharp right onto %{name}
+ 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}
+ onramp_left_without_exit: Turn left on the ramp onto %{name}
+ 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}
+ leave_roundabout_without_exit: Leave roundabout - %{name}
+ stay_roundabout_without_exit: Stay on roundabout - %{name}
+ start_without_exit: Start at end of %{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}
+ roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+ unnamed: "unnamed road"
+ 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"