X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..574bfa06db4be7cec30cabe6e6be5d4e2baf6daf:/config/locales/en-GB.yml?ds=inline
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c08cf90ff..6feab9c34 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,7 +1,10 @@
# Messages for British English (British English)
# Exported from translatewiki.net
# Export driver: phpyaml
+# Author: Abijeet Patro
# Author: Andibing
+# Author: BEANS
+# Author: Bjh21
# Author: Bpfhjquevaps
# Author: Bruce89
# Author: Caliburn
@@ -10,15 +13,22 @@
# Author: E THP
# Author: EdLoach
# Author: Eduard Popov
+# Author: Gravitystorm
# Author: IknowJoseph
# Author: Jagwar
# Author: Jguthrie100
+# Author: Jlrb+
# Author: Kosovastar
# Author: Macofe
# Author: Meno25
+# Author: Michel Bakni
+# Author: Mvolz
# Author: Sampablokuper
+# Author: Samwilson
# Author: Shirayuki
# Author: Smsm1
+# Author: Tlubenov
+# Author: TomH
# Author: دÙÙÙد
---
en-GB:
@@ -28,7 +38,36 @@ en-GB:
formats:
friendly: '%e %B %Y at %H:%M'
blog: '%e %B %Y'
+ helpers:
+ file:
+ prompt: Choose file
+ submit:
+ diary_comment:
+ create: Save
+ diary_entry:
+ create: Publish
+ update: Update
+ issue_comment:
+ create: Add Comment
+ message:
+ create: Send
+ client_application:
+ create: Register
+ update: Update
+ redaction:
+ create: Create redaction
+ update: Save redaction
+ trace:
+ create: Upload
+ update: Save Changes
+ user_block:
+ create: Create block
+ update: Update block
activerecord:
+ errors:
+ messages:
+ invalid_email_address: does not appear to be a valid e-mail address
+ email_address_not_routable: is not routable
models:
acl: Access Control List
changeset: Changeset
@@ -37,6 +76,7 @@ en-GB:
diary_comment: Diary Comment
diary_entry: Diary Entry
friend: Friend
+ issue: ÐÑоблем
language: Language
message: Message
node: Node
@@ -53,6 +93,7 @@ en-GB:
relation: Relation
relation_member: Relation Member
relation_tag: Relation Tag
+ report: Report
session: Session
trace: Trace
tracepoint: Trace Point
@@ -64,6 +105,12 @@ en-GB:
way_node: Way Node
way_tag: Way Tag
attributes:
+ client_application:
+ callback_url: Callback URL
+ support_url: Support URL
+ allow_write_api: modify the map
+ allow_read_gpx: read their private GPS traces
+ allow_write_gpx: upload GPS traces
diary_comment:
body: Body
diary_entry:
@@ -78,12 +125,15 @@ en-GB:
trace:
user: User
visible: Visible
- name: Name
+ name: Filename
size: Size
latitude: Latitude
longitude: Longitude
public: Public
description: Description
+ gpx_file: Upload GPX File
+ visibility: Visibility
+ tagstring: Tags
message:
sender: Sender
title: Subject
@@ -96,6 +146,48 @@ en-GB:
description: Description
languages: Languages
pass_crypt: Password
+ help:
+ trace:
+ tagstring: comma delimited
+ datetime:
+ distance_in_words_ago:
+ about_x_hours:
+ one: about 1 hour ago
+ other: about %{count} hours ago
+ about_x_months:
+ one: about 1 month ago
+ other: about %{count} months ago
+ about_x_years:
+ one: about 1 year ago
+ other: about %{count} years ago
+ almost_x_years:
+ one: almost 1 year ago
+ other: almost %{count} years ago
+ half_a_minute: half a minute ago
+ less_than_x_seconds:
+ one: less than 1 second ago
+ other: less than %{count} seconds ago
+ less_than_x_minutes:
+ one: less than a minute ago
+ other: less than %{count} minutes ago
+ over_x_years:
+ one: over 1 year ago
+ other: over %{count} years ago
+ x_seconds:
+ one: 1 second ago
+ other: '%{count} seconds ago'
+ x_minutes:
+ one: 1 minute ago
+ other: '%{count} minutes ago'
+ x_days:
+ one: 1 day ago
+ other: '%{count} days ago'
+ x_months:
+ one: 1 month ago
+ other: '%{count} months ago'
+ x_years:
+ one: 1 year ago
+ other: '%{count} years ago'
printable_name:
with_version: '%{id}, v%{version}'
with_name_html: '%{name} (%{id})'
@@ -113,15 +205,46 @@ en-GB:
remote:
name: Remote Control
description: Remote Control (JOSM or Merkaartor)
+ auth:
+ providers:
+ openid: OpenID
+ google: Google
+ facebook: Facebook
+ windowslive: Windows Live
+ github: GitHub
+ wikipedia: Wikipedia
+ api:
+ notes:
+ comment:
+ opened_at_html: Created %{when}
+ opened_at_by_html: Created %{when} by %{user}
+ commented_at_html: Updated %{when}
+ commented_at_by_html: Updated %{when} by %{user}
+ closed_at_html: Resolved %{when}
+ closed_at_by_html: Resolved %{when} by %{user}
+ reopened_at_html: Reactivated %{when}
+ reopened_at_by_html: Reactivated %{when} by %{user}
+ rss:
+ title: OpenStreetMap Notes
+ description_area: A list of notes, reported, commented on or closed in your
+ area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+ description_item: An rss feed for note %{id}
+ opened: new note (near %{place})
+ commented: new comment (near %{place})
+ closed: closed note (near %{place})
+ reopened: reactivated note (near %{place})
+ entry:
+ comment: Comment
+ full: Full note
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}
+ created_html: Created %{time}
+ closed_html: Closed %{time}
+ created_by_html: Created %{time} by %{user}
+ deleted_by_html: Deleted %{time} by %{user}
+ edited_by_html: Edited %{time} by %{user}
+ closed_by_html: Closed %{time} by %{user}
version: Version
in_changeset: Changeset
anonymous: anonymous
@@ -131,6 +254,8 @@ en-GB:
view_history: View History
view_details: View Details
location: 'Location:'
+ common_details:
+ coordinates_html: '%{latitude}, %{longitude}'
changeset:
title: 'Changeset: %{id}'
belongs_to: Author
@@ -141,9 +266,8 @@ en-GB:
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
+ hidden_commented_by: Hidden comment from %{user} %{when}
+ commented_by: Comment from %{user} %{when}
changesetxml: Changeset XML
osmchangexml: osmChange XML
feed:
@@ -151,30 +275,32 @@ en-GB:
title_comment: Changeset %{id} - %{comment}
join_discussion: Log in to join the discussion
discussion: Discussion
+ still_open: Changeset still open - discussion will open once the changeset is
+ closed.
node:
- title: 'Node: %{name}'
- history_title: 'Node History: %{name}'
+ title_html: 'Node: %{name}'
+ history_title_html: 'Node History: %{name}'
way:
- title: 'Way: %{name}'
- history_title: 'Way History: %{name}'
+ title_html: 'Way: %{name}'
+ history_title_html: 'Way History: %{name}'
nodes: Nodes
- also_part_of:
+ also_part_of_html:
one: part of way %{related_ways}
other: part of ways %{related_ways}
relation:
- title: 'Relation: %{name}'
- history_title: 'Relation History: %{name}'
+ title_html: 'Relation: %{name}'
+ history_title_html: 'Relation History: %{name}'
members: Members
relation_member:
- entry: '%{type} %{name}'
- entry_role: '%{type} %{name} as %{role}'
+ entry_html: '%{type} %{name}'
+ entry_role_html: '%{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})
+ entry_html: Relation %{relation_name}
+ entry_role_html: Relation %{relation_name} (as %{relation_role})
not_found:
sorry: 'Sorry, %{type} #%{id} could not be found.'
type:
@@ -211,7 +337,9 @@ en-GB:
tag: The wiki description page for the %{key}=%{value} tag
wikidata_link: The %{page} item on Wikidata
wikipedia_link: The %{page} article on Wikipedia
+ wikimedia_commons_link: The %{page} item on Wikimedia Commons
telephone_link: Call %{phone_number}
+ colour_preview: Colour %{colour_value} preview
note:
title: 'Note: %{id}'
new_note: New Note
@@ -219,20 +347,17 @@ en-GB:
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
+ opened_by: Created by %{user} %{when}
+ opened_by_anonymous: Created by anonymous %{when}
+ commented_by: Comment from %{user} %{when}
+ commented_by_anonymous: Comment from anonymous %{when}
+ closed_by: Resolved by %{user} %{when}
+ closed_by_anonymous: Resolved by anonymous %{when}
+ reopened_by: Reactivated by %{user} %{when}
+ reopened_by_anonymous: Reactivated by anonymous %{when}
+ hidden_by: Hidden by %{user} %{when}
report: Report this note
+ coordinates_html: '%{latitude}, %{longitude}'
query:
title: Query Features
introduction: Click on the map to find nearby features.
@@ -256,7 +381,7 @@ en-GB:
index:
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.
@@ -270,14 +395,26 @@ en-GB:
changeset_comments:
comment:
comment: 'New comment on changeset #%{changeset_id} by %{author}'
- commented_at_by_html: Updated %{when} ago by %{user}
+ commented_at_by_html: Updated %{when} by %{user}
+ comments:
+ comment: 'New comment on changeset #%{changeset_id} by %{author}'
index:
title_all: OpenStreetMap changeset discussion
title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
+ timeout:
+ sorry: Sorry, the list of changeset comments you requested took too long to
+ retrieve.
diary_entries:
new:
title: New Diary Entry
- publish_button: Publish
+ form:
+ subject: 'Subject:'
+ body: 'Body:'
+ language: 'Language:'
+ location: 'Location:'
+ latitude: 'Latitude:'
+ longitude: 'Longitude:'
+ use_map_link: use map
index:
title: Users' diaries
title_friends: Friends' diaries
@@ -285,49 +422,44 @@ en-GB:
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
newer_entries: Newer Entries
edit:
title: Edit diary entry
- subject: 'Subject:'
- body: 'Body:'
- language: 'Language:'
- location: 'Location:'
- latitude: 'Latitude:'
- longitude: 'Longitude:'
- use_map_link: use map
- save_button: Save
marker_text: Diary entry location
show:
title: '%{user}''s diary | %{title}'
user_title: '%{user}''s diary'
leave_a_comment: Leave a comment
- login_to_leave_a_comment: '%{login_link} to leave a comment'
+ login_to_leave_a_comment_html: '%{login_link} to leave a comment'
login: Login
- save_button: Save
no_such_entry:
title: No such diary entry
heading: 'No entry with the id: %{id}'
body: Sorry, there is no diary entry or comment with the id %{id}. Please check
your spelling, or maybe the link you clicked is wrong.
diary_entry:
- posted_by: Posted by %{link_user} on %{created} in %{language_link}
+ posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
comment_link: Comment on this entry
- reply_link: Reply to this entry
+ reply_link: Send a message to the author
comment_count:
zero: No comments
one: '%{count} comment'
other: '%{count} comments'
edit_link: Edit this entry
hide_link: Hide this entry
+ unhide_link: Unhide this entry
confirm: Confirm
+ report: Report this entry
diary_comment:
- comment_from: Comment from %{link_user} on %{comment_created_at}
+ comment_from_html: Comment from %{link_user} on %{comment_created_at}
hide_link: Hide this comment
+ unhide_link: Unhide this comment
confirm: Confirm
+ report: Report this comment
location:
location: 'Location:'
view: View
@@ -347,20 +479,31 @@ en-GB:
post: Post
when: When
comment: Comment
- ago: '%{ago} ago'
newer_comments: Newer Comments
older_comments: Older Comments
+ friendships:
+ make_friend:
+ heading: Add %{user} as a friend?
+ button: Add as friend
+ success: '%{name} is now your friend!'
+ failed: Sorry, failed to add %{name} as a friend.
+ already_a_friend: You are already friends with %{name}.
+ remove_friend:
+ heading: Unfriend %{user}?
+ button: Unfriend
+ success: '%{name} was removed from your friends.'
+ not_a_friend: '%{name} is not one of your friends.'
geocoder:
search:
title:
- latlon: Results from Internal
- ca_postcode: Results from Geocoder.CA
- osm_nominatim: Results from OpenStreetMap
+ latlon_html: Results from Internal
+ ca_postcode_html: Results from Geocoder.CA
+ osm_nominatim_html: Results from OpenStreetMap
Nominatim
- geonames: Results from GeoNames
- osm_nominatim_reverse: Results from OpenStreetMap
+ geonames_html: Results from GeoNames
+ osm_nominatim_reverse_html: Results from OpenStreetMap
Nominatim
- geonames_reverse: Results from GeoNames
+ geonames_reverse_html: Results from GeoNames
search_osm_nominatim:
prefix_format: '%{name}'
prefix:
@@ -369,12 +512,19 @@ en-GB:
chair_lift: Chairlift
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
@@ -420,38 +570,37 @@ en-GB:
fuel: Fuel
gambling: Gambling
grave_yard: Graveyard
+ grit_bin: Grit Bin
hospital: Hospital
hunting_stand: Hunting Stand
ice_cream: Ice Cream
+ internet_cafe: ÐнÑеÑÐ½ÐµÑ ÐаÑе
kindergarten: Nursery School
+ language_school: Ðзиково ÑÑилиÑе
library: Library
marketplace: Marketplace
monastery: Monastery
motorcycle_parking: Motorcycle Parking
+ music_school: ÐÑзикално ÑÑилиÑе
nightclub: Night Club
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
post_box: Post Box
post_office: Post Office
- preschool: Pre-School
prison: Prison
pub: Pub
public_building: Public Building
recycling: Recycling Point
restaurant: Restaurant
- retirement_home: Retirement Home
- sauna: Sauna
school: School
shelter: Shelter
- shop: Shop
shower: Shower
social_centre: Social Centre
- social_club: Social Club
social_facility: Social Facility
studio: Studio
swimming_pool: Swimming Pool
@@ -466,12 +615,13 @@ en-GB:
village_hall: Village Hall
waste_basket: Waste Bin
waste_disposal: Waste Disposal
- youth_centre: Youth Centre
+ water_point: Water Point
boundary:
administrative: Administrative Boundary
census: Census Boundary
national_park: National Park
protected_area: Protected Area
+ "yes": ÐÑаниÑа
bridge:
aqueduct: Aqueduct
boardwalk: Promenade
@@ -480,6 +630,17 @@ en-GB:
viaduct: Viaduct
"yes": Bridge
building:
+ apartment: Apartment
+ apartments: Apartments
+ cabin: Cabin
+ college: College Building
+ commercial: ТÑÑговÑка СгÑада
+ construction: Building under Construction
+ garage: Garage
+ garages: ÐаÑажи
+ house: House
+ industrial: ÐндÑÑÑÑиална ÑгÑада
+ roof: Roof
"yes": Building
craft:
brewery: Brewery
@@ -494,25 +655,31 @@ en-GB:
"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
@@ -529,14 +696,15 @@ en-GB:
services: Motorway Services
speed_camera: Speed Camera
steps: Steps
+ stop: Stop Sign
street_lamp: Street Lamp
tertiary: Tertiary Road
tertiary_link: Tertiary Road
track: Track
traffic_signals: Traffic Signals
- trail: Trail
trunk: Trunk Road
trunk_link: Trunk Road
+ turning_loop: Turning Loop
unclassified: Unclassified Road
"yes": Road
historic:
@@ -552,10 +720,10 @@ en-GB:
fort: Fort
heritage: Heritage Site
house: House
- icon: Icon
manor: Manor
memorial: Memorial
mine: Mine
+ mine_shaft: Mine Shaft
monument: Monument
roman_road: Roman Road
ruins: Ruins
@@ -565,6 +733,7 @@ en-GB:
wayside_cross: Wayside Cross
wayside_shrine: Wayside Shrine
wreck: Wreck
+ "yes": Historic Site
junction:
"yes": Junction
landuse:
@@ -595,7 +764,6 @@ en-GB:
reservoir_watershed: Reservoir Watershed
residential: Residential Area
retail: Retail
- road: Road Area
village_green: Village Green
vineyard: Vineyard
"yes": Landuse
@@ -604,6 +772,7 @@ en-GB:
bird_hide: Bird Hide
common: Common Land
dog_park: Dog Park
+ firepit: Fire Pit
fishing: Fishing Area
fitness_centre: Fitness Centre
fitness_station: Fitness Station
@@ -628,16 +797,46 @@ en-GB:
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: Oil 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: Windmill
works: Factory
"yes": Man-made
military:
airfield: Military Airfield
barracks: Barracks
bunker: Bunker
+ "yes": Military
mountain_pass:
"yes": Mountain Pass
natural:
@@ -683,11 +882,14 @@ en-GB:
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
@@ -696,6 +898,7 @@ en-GB:
place:
allotments: Allotments
city: City
+ city_block: City Block
country: Country
county: County
farm: Farm
@@ -709,13 +912,14 @@ en-GB:
municipality: Municipality
neighbourhood: Neighbourhood
postcode: Postcode
+ quarter: Quarter
region: Region
sea: Sea
+ square: Square
state: State
subdivision: Subdivision
suburb: Suburb
town: Town
- unincorporated_area: Unincorporated Area
village: Village
"yes": Place
railway:
@@ -741,6 +945,7 @@ en-GB:
switch: Railway Points
tram: Tramway
tram_stop: Tram Stop
+ yard: Railway Yard
shop:
alcohol: Off Licence
antiques: Antiques
@@ -749,6 +954,7 @@ en-GB:
beauty: Beauty Shop
beverages: Beverages Shop
bicycle: Bicycle Shop
+ bookmaker: Bookmaker
books: Book Shop
boutique: Boutique
butcher: Butcher
@@ -773,12 +979,10 @@ en-GB:
estate_agent: Estate Agent
farm: Farm Shop
fashion: Fashion Shop
- fish: Fishmonger
florist: Florist
food: Food Shop
funeral_directors: Funeral Directors
furniture: Furniture
- gallery: Gallery
garden_centre: Garden Centre
general: General Store
gift: Gift Shop
@@ -787,11 +991,15 @@ en-GB:
hairdresser: Hairdresser
hardware: Hardware Store
hifi: Hi-Fi
+ houseware: Houseware Shop
+ interior_decoration: Interior Decoration
jewelry: Jewellers
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
@@ -799,15 +1007,19 @@ en-GB:
optician: Optician
organic: Organic Food Shop
outdoor: Outdoor Shop
+ paint: Paint Shop
+ pawnbroker: Pawnbroker
pet: Pet Shop
- pharmacy: Pharmacy
photo: Photo Shop
+ seafood: Seafood
second_hand: Second-hand Shop
shoes: Shoe Shop
sports: Sports Shop
stationery: Stationers
supermarket: Supermarket
tailor: Tailor
+ ticket: Ticket Shop
+ tobacco: Tobacconist
toys: Toy Shop
travel_agency: Travel Agency
video: Video Shop
@@ -815,7 +1027,7 @@ en-GB:
"yes": Shop
tourism:
alpine_hut: Alpine Hut
- apartment: Apartment
+ apartment: Holiday Flat
artwork: Artwork
attraction: Attraction
bed_and_breakfast: Bed and Breakfast
@@ -866,7 +1078,7 @@ en-GB:
level10: Suburb Boundary
description:
title:
- osm_nominatim: Location from OpenStreetMap
+ osm_nominatim: Location from OpenStreetMap
Nominatim
geonames: Location from GeoNames
types:
@@ -876,6 +1088,9 @@ en-GB:
results:
no_results: No results found
more_results: More results
+ issues:
+ index:
+ reports: ÐÑÑеÑи
layouts:
project_name:
title: OpenStreetMap
@@ -932,15 +1147,15 @@ en-GB:
header: '%{from_user} has commented on the OpenStreetMap diary entry with the
subject %{subject}:'
footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
- or reply at %{replyurl}
+ or send a message to the author at %{replyurl}
message_notification:
subject_header: '[OpenStreetMap] %{subject}'
hi: Hi %{to_user},
header: '%{from_user} has sent you a message through OpenStreetMap with the
subject %{subject}:'
- footer_html: You can also read the message at %{readurl} and you can reply at
- %{replyurl}
- friend_notification:
+ footer_html: You can also read the message at %{readurl} and you can send a
+ message to the author at %{replyurl}
+ friendship_notification:
hi: Hi %{to_user},
subject: '[OpenStreetMap] %{user} added you as a friend'
had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
@@ -960,8 +1175,10 @@ en-GB:
import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
success:
subject: '[OpenStreetMap] GPX Import success'
- loaded_successfully: loaded successfully with %{trace_points} out of a possible
- %{possible_points} points.
+ loaded_successfully:
+ one: loaded successfully with %{trace_points} out of a possible 1 point.
+ other: loaded successfully with %{trace_points} out of a possible %{possible_points}
+ points.
signup_confirm:
subject: '[OpenStreetMap] Welcome to OpenStreetMap'
greeting: Hi there!
@@ -1027,10 +1244,9 @@ en-GB:
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}'
+ your_changeset: '%{commenter} left a comment at %{time} on one of your changesets'
+ commented_changeset: '%{commenter} left a comment at %{time} on a changeset
+ you are watching created by %{changeset_author}'
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}.
@@ -1051,8 +1267,8 @@ en-GB:
from: From
subject: Subject
date: Date
- no_messages_yet: You have no messages yet. Why not get in touch with some of
- the %{people_mapping_nearby_link}?
+ no_messages_yet_html: You have no messages yet. Why not get in touch with some
+ of the %{people_mapping_nearby_link}?
people_mapping_nearby: people mapping nearby
message_summary:
unread_button: Mark as unread
@@ -1061,10 +1277,9 @@ en-GB:
destroy_button: Delete
new:
title: Send message
- send_message_to: Send a new message to %{name}
+ send_message_to_html: Send a new message to %{name}
subject: Subject
body: Body
- send_button: Send
back_to_inbox: Back to inbox
create:
message_sent: Message sent
@@ -1076,7 +1291,7 @@ en-GB:
body: Sorry, there is no message with that id.
outbox:
title: Outbox
- my_inbox: My %{inbox_link}
+ my_inbox_html: My %{inbox_link}
inbox: inbox
outbox: outbox
messages:
@@ -1085,8 +1300,8 @@ en-GB:
to: To
subject: Subject
date: Date
- no_sent_messages: You have no sent messages yet. Why not get in touch with some
- of the %{people_mapping_nearby_link}?
+ no_sent_messages_html: You have no sent messages yet. Why not get in touch with
+ some of the %{people_mapping_nearby_link}?
people_mapping_nearby: people mapping nearby
reply:
wrong_user: You are logged in as `%{user}' but the message you have asked to
@@ -1116,8 +1331,8 @@ en-GB:
about:
next: Next
copyright_html: ©OpenStreetMap
contributors
- used_by: '%{name} powers map data on thousands of web sites, mobile apps, and
- hardware devices'
+ used_by_html: '%{name} provides map data for 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.
@@ -1129,7 +1344,7 @@ en-GB:
community_driven_title: Community Driven
community_driven_html: |-
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 user diaries, community blogs, and the OSM Foundation website.
+ To learn more about the community, see the OpenStreetMap Blog, user diaries, community blogs, and the OSM Foundation website.
open_data_title: Open Data
open_data_html: |-
OpenStreetMap is open data: you are free to use it for any purpose
@@ -1138,24 +1353,23 @@ en-GB:
under the same licence. See the Copyright and
Licence page for details.
legal_title: Legal
- legal_html: "This site and many other related services are formally operated
- by the \nOpenStreetMap Foundation
+ legal_1_html: "This site and many other related services are formally operated
+ by the \nOpenStreetMap Foundation
(OSMF) \non behalf of the community. Use of all OSMF operated services is
- subject \nto our \nAcceptable
- Use Policies and our Privacy
- Policy\n
\nPlease contact
- the OSMF \nif you have licensing, copyright or other legal questions and
- issues."
+ subject \nto our Terms
+ of Use, \nAcceptable
+ Use Policies and our Privacy
+ Policy."
partners_title: Partners
copyright:
foreign:
title: About this translation
- text: In the event of a conflict between this translated page and %{english_original_link},
+ html: In the event of a conflict between this translated page and %{english_original_link},
the English page shall take precedence
english_link: the English original
native:
title: About this page
- text: You are viewing the English version of the copyright page. You can go
+ html: You are viewing the English version of the copyright page. You can go
back to the %{native_link} of this page or you can stop reading about copyright
and %{mapping_link}.
native_link: British English version
@@ -1164,34 +1378,32 @@ en-GB:
title_html: Copyright and Licence
intro_1_html: |-
OpenStreetMap® is open data, licensed under the Open Data
+ href="https://opendatacommons.org/licenses/odbl/">Open Data
Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF).
+ href="https://osmfoundation.org/">OpenStreetMap Foundation (OSMF).
intro_2_html: You are free to copy, distribute, transmit and adapt our data,
as long as you credit OpenStreetMap and its contributors. If you alter or
build upon our data, you may distribute the result only under the same licence.
- The full legal code
- explains your rights and responsibilities.
- intro_3_html: |-
- The cartography in our map tiles, and our documentation, are
- licenced under the Creative
- Commons Attribution-ShareAlike 2.0 licence (CC BY-SA).
+ The full legal
+ code explains your rights and responsibilities.
+ intro_3_1_html: "Our documentation is licensed under the \nCreative\nCommons
+ Attribution-ShareAlike 2.0 licence (CC BY-SA 2.0)."
credit_title_html: How to credit OpenStreetMap
credit_1_html: |-
We require that you use the credit “© OpenStreetMap
contributors”.
- credit_2_html: |-
+ credit_2_1_html: |-
You must also make it clear that the data is available under the Open
Database Licence, and if using our map tiles, that the cartography is
- licenced as CC BY-SA. You may do this by linking to
- this copyright page.
+ licensed as CC BY-SA. You may do this by linking to
+ this copyright page.
Alternatively, and as a requirement if you are distributing OSM in a
data form, you can name and link directly to the licence(s). In media
where links are not possible (e.g. printed works), we suggest you
direct your readers to openstreetmap.org (perhaps by expanding
'OpenStreetMap' to this full address), to opendatacommons.org, and
if relevant, to creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
For a browsable electronic map, the credit should appear in the corner of the map.
For example:
attribution_example:
@@ -1200,9 +1412,7 @@ en-GB:
more_title_html: Finding out more
more_1_html: |-
Read more about using our data, and how to credit us, at the OSMF Licence page and the community Legal
- FAQ.
+ href="https://osmfoundation.org/Licence">OSMF Licence page.
more_2_html: |-
Although OpenStreetMap is open data, we cannot provide a
free-of-charge map API for third-parties.
@@ -1235,8 +1445,11 @@ en-GB:
Direction Générale des Impôts.'
contributors_nl_html: 'Netherlands: Contains © AND data,
2007 (www.and.com)'
- contributors_nz_html: 'New Zealand: Contains data sourced
- from Land Information New Zealand. Crown Copyright reserved.'
+ contributors_nz_html: |-
+ New Zealand: Contains data sourced from the
+ LINZ Data Service and
+ licensed for reuse under
+ CC BY 4.0.
contributors_si_html: |-
Slovenia: Contains data from the
Surveying and Mapping Authority and
@@ -1246,9 +1459,9 @@ en-GB:
from Chief Directorate: National Geo-Spatial
Information, State copyright reserved.'
contributors_gb_html: 'United Kingdom: Contains Ordnance
- Survey data © Crown copyright and database right 2010-12.'
+ Survey data © Crown copyright and database right 2010-19.'
contributors_footer_1_html: For further details of these, and other sources
- that have been used to help improve OpenStreetMap, please see the Contributors
+ that have been used to help improve OpenStreetMap, please see the Contributors
page on the OpenStreetMap Wiki.
contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply
that the original data provider endorses OpenStreetMap, provides any warranty,
@@ -1259,15 +1472,14 @@ en-GB:
permission from the copyright holders.
infringement_2_html: If you believe that copyrighted material has been inappropriately
added to the OpenStreetMap database or this site, please refer to our takedown
- procedure or file directly at our on-line
+ href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+ procedure or file directly at our on-line
filing page.
trademarks_title_html: 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 Licence
- Working Group.
+ have questions about your use of the marks, please see our Trademark
+ Policy.
index:
js_1: You are either using a browser that does not support JavaScript, or you
have disabled JavaScript.
@@ -1281,19 +1493,19 @@ en-GB:
the remote control option is enabled
edit:
not_public: You have not set your edits to be public.
- not_public_description: You can no longer edit the map unless you do so. You
- can set your edits as public from your %{user_page}.
+ not_public_description_html: You can no longer edit the map unless you do so.
+ You can set your edits as public from your %{user_page}.
user_page_link: user page
- anon_edits: (%{link})
+ anon_edits_html: (%{link})
anon_edits_link_text: Find out why this is the case.
- flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap
- Flash editor. You can download
- Flash Player from Adobe.com. Several
+ flash_player_required_html: You need a Flash player to use Potlatch, the OpenStreetMap
+ Flash editor. You can download
+ Flash Player from Adobe.com. Several
other options are also available for editing OpenStreetMap.
potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
should deselect the current way or point, if editing in live mode, or click
save if you have a save button.)
- potlatch2_not_configured: Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+ potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
for more information
potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2,
you should click save.)
@@ -1309,7 +1521,7 @@ en-GB:
map_image: Map Image (shows standard layer)
embeddable_html: Embeddable HTML
licence: Licence
- export_details: OpenStreetMap data is licenced under the Open
+ export_details_html: OpenStreetMap data is licenced under the Open
Data Commons Open Database Licence (ODbL).
too_large:
advice: 'If the above export fails, please consider using one of the sources
@@ -1364,7 +1576,7 @@ en-GB:
title: Other concerns
explanation_html: "If you have concerns about how our data is being used or
about the contents please consult our\ncopyright page
- for more legal information, or contact the appropriate \nOSMF
+ for more legal information, or contact the appropriate \nOSMF
working group."
help:
title: Getting Help
@@ -1373,16 +1585,16 @@ en-GB:
mapping topics.
welcome:
url: /welcome
- title: Welcome to OSM
+ title: Welcome to OpenStreetMap
description: Start with this quick guide covering the OpenStreetMap basics.
beginners_guide:
- url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+ url: https://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
+ title: Help Forum
+ description: Ask a question or look up answers on OpenStreetMap's question-and-answer
site.
mailing_lists:
title: Mailing Lists
@@ -1400,9 +1612,9 @@ en-GB:
description: Help for companies and organisations switching to OpenStreetMap
based maps and other services.
wiki:
- url: http://wiki.openstreetmap.org/
- title: wiki.openstreetmap.org
- description: Browse the wiki for in-depth OSM documentation.
+ url: https://wiki.openstreetmap.org/
+ title: OpenStreetMap Wiki
+ description: Browse the wiki for in-depth OpenStreetMap documentation.
sidebar:
search_results: Search Results
close: Close
@@ -1412,7 +1624,7 @@ en-GB:
get_directions_title: Find directions between two points
from: From
to: To
- where_am_i: Where am I?
+ 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
@@ -1490,7 +1702,7 @@ en-GB:
edit: Edit
preview: Preview
markdown_help:
- title_html: Parsed with Markdown
+ title_html: Parsed with kramdown
headings: Headings
heading: Heading
subheading: Subheading
@@ -1534,14 +1746,14 @@ en-GB:
paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants
to collaborate\nwith, and communicate with, the community. If you are considering\nany
activities other than editing by hand, please read and follow the guidelines
- on \nImports
- and \nAutomated
+ on \nImports
+ and \nAutomated
Edits."
questions:
title: Any questions?
paragraph_1_html: |-
OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics.
- Get help here.
+ Get help here. With an organization making plans for OpenStreetMap? Check out the Welcome Mat.
start_mapping: Start Mapping
add_a_note:
title: No Time To Edit? Add a Note!
@@ -1559,16 +1771,10 @@ en-GB:
identifiable: Identifiable (shown in trace list and as identifiable, ordered
points with timestamps)
new:
- upload_gpx: 'Upload GPX File:'
- description: 'Description:'
- tags: 'Tags:'
- tags_help: comma delimited
- visibility: 'Visibility:'
visibility_help: what does this mean?
- visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
- upload_button: Upload
+ visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
help: Help
- help_url: http://wiki.openstreetmap.org/wiki/Upload
+ help_url: https://wiki.openstreetmap.org/wiki/Upload
create:
upload_trace: Upload GPS Trace
trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in
@@ -1576,27 +1782,14 @@ en-GB:
will be sent to you on completion.
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.
+ this 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.
edit:
title: Editing trace %{name}
heading: Editing trace %{name}
- filename: 'Filename:'
- download: download
- uploaded_at: 'Uploaded:'
- points: 'Points:'
- start_coord: 'Start coordinate:'
- map: map
- edit: edit
- owner: 'Owner:'
- description: 'Description:'
- tags: 'Tags:'
- tags_help: comma delimited
- save_button: Save Changes
- visibility: 'Visibility:'
visibility_help: what does this mean?
visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
trace_optionals:
@@ -1626,8 +1819,9 @@ en-GB:
newer: Newer Traces
trace:
pending: PENDING
- count_points: '%{count} points'
- ago: '%{time_in_words_ago} ago'
+ count_points:
+ one: 1 point
+ other: '%{count} points'
more: more
trace_details: View Trace Details
view_map: View Map
@@ -1646,11 +1840,11 @@ en-GB:
description: Browse recent GPS track uploads
tagged_with: ' tagged with %{tags}'
empty_html: Nothing here yet. Upload a new trace
- or learn more about GPS tracing on the wiki
+ or learn more about GPS tracing on the wiki
page.
upload_trace: Upload a trace
see_all_traces: See all traces
- delete:
+ destroy:
scheduled_for_deletion: Trace scheduled for deletion
make_public:
made_public: Trace made public
@@ -1681,9 +1875,9 @@ en-GB:
oauth:
authorize:
title: Authorise 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.
+ request_access_html: 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.
allow_write_prefs: modify your user preferences.
@@ -1695,7 +1889,7 @@ en-GB:
grant_access: Grant Access
authorize_success:
title: Authorisation request allowed
- allowed: You have granted application %{app_name} access to your account.
+ allowed_html: You have granted application %{app_name} access to your account.
verification: The verification code is %{code}.
authorize_failure:
title: Authorisation request failed
@@ -1708,10 +1902,8 @@ en-GB:
oauth_clients:
new:
title: Register a new application
- submit: Register
edit:
title: Edit your application
- submit: Edit
show:
title: OAuth details for %{app_name}
key: 'Consumer Key:'
@@ -1724,13 +1916,6 @@ en-GB:
delete: Delete Client
confirm: Are you sure?
requests: 'Requesting the following permissions from the user:'
- allow_read_prefs: read their user preferences.
- allow_write_prefs: modify their user preferences.
- allow_write_diary: create diary entries, comments and make friends.
- allow_write_api: modify the map.
- allow_read_gpx: read their private GPS traces.
- allow_write_gpx: upload GPS traces.
- allow_write_notes: modify notes.
index:
title: My OAuth Details
my_tokens: My Authorised Applications
@@ -1740,25 +1925,13 @@ en-GB:
issued_at: Issued At
revoke: Revoke!
my_apps: My Client Applications
- no_apps: Do you have an application you would like to register for use with
- us using the %{oauth} standard? You must register your web application before
- it can make OAuth requests to this service.
+ no_apps_html: Do you have an application you would like to register for use
+ with us using the %{oauth} standard? You must register your web application
+ before it can make OAuth requests to this service.
registered_apps: 'You have the following client applications registered:'
register_new: Register your application
form:
- name: Name
- required: Required
- url: Main Application URL
- callback_url: Callback URL
- support_url: Support URL
requests: 'Request the following permissions from the user:'
- allow_read_prefs: read their user preferences.
- allow_write_prefs: modify their user preferences.
- allow_write_diary: create diary entries, comments and make friends.
- allow_write_api: modify the map.
- allow_read_gpx: read their private GPS traces.
- allow_write_gpx: upload GPS traces.
- allow_write_notes: modify notes.
not_found:
sorry: Sorry, that %{type} could not be found.
create:
@@ -1773,7 +1946,7 @@ en-GB:
heading: Login
email or username: 'E-mail Address or Username:'
password: 'Password:'
- openid: '%{logo} OpenID:'
+ openid_html: '%{logo} OpenID:'
remember: Remember me
lost password link: Lost your password?
login_button: Login
@@ -1839,8 +2012,6 @@ en-GB:
reset_password:
title: Reset password
heading: Reset Password for %{user}
- password: 'Password:'
- confirm password: 'Confirm Password:'
reset: Reset Password
flash changed: Your password has been changed.
flash token bad: Did not find that token, check the URL maybe?
@@ -1848,8 +2019,8 @@ en-GB:
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 webmaster to
- arrange for an account to be created - we will try and deal with the request
+ contact_webmaster_html: Please contact the webmaster
+ 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
@@ -1861,9 +2032,9 @@ en-GB:
terms.
email address: 'Email Address:'
confirm email address: 'Confirm Email Address:'
- not displayed publicly: Your address is not displayed publicly, see our privacy policy
- for more information
+ not_displayed_publicly_html: Your address is not displayed publicly, see our
+ privacy policy for more information
display name: 'Display Name:'
display name description: Your publicly displayed username. You can change this
later in the preferences.
@@ -1877,20 +2048,17 @@ en-GB:
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 this wiki page.
- terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+ terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
terms:
- title: Contributor terms
- heading: Contributor terms
- read and accept: Please read the agreement and press the agree button to confirm
- that you accept the terms of this agreement for your existing and future contributions.
- consider_pd: In addition to the above agreement, I consider my contributions
- to be in the Public Domain
+ title: Terms
+ heading: Terms
+ consider_pd: In addition to the above, I consider my contributions to be in
+ the Public Domain
consider_pd_why: what's this?
consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
- guidance: 'Information to help understand these terms: a human
+ guidance_html: 'Information to help understand these terms: a human
readable summary and some informal translations'
- agree: Agree
- declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+ declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
decline: Decline
you need to accept or decline: Please read and then either accept or decline
the new Contributor Terms to continue.
@@ -1926,20 +2094,18 @@ en-GB:
remove as friend: Unfriend
add as friend: Add Friend
mapper since: 'Mapper since:'
- ago: (%{time_in_words_ago} ago)
ct status: 'Contributor terms:'
ct undecided: Undecided
ct declined: Declined
- ct accepted: Accepted %{ago} ago
- latest edit: 'Latest edit %{ago}:'
+ latest edit: 'Latest edit (%{ago}):'
email address: 'Email address:'
created from: 'Created from:'
status: 'Status:'
spam score: 'Spam Score:'
description: Description
user location: User location
- if set location: Set your home location on the %{settings_link} page to see
- nearby users.
+ if_set_location_html: Set your home location on the %{settings_link} page to
+ see nearby users.
settings_link_text: settings
no friends: You have not added any friends yet.
km away: '%{count}km away'
@@ -1982,21 +2148,21 @@ en-GB:
email never displayed publicly: (never displayed publicly)
external auth: 'External Authentication:'
openid:
- link: http://wiki.openstreetmap.org/wiki/OpenID
+ link: https://wiki.openstreetmap.org/wiki/OpenID
link text: what is this?
public editing:
heading: 'Public editing:'
enabled: Enabled. Not anonymous and can edit data.
- enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+ enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
enabled link text: what is this?
disabled: Disabled and cannot edit data, all previous edits are anonymous.
disabled link text: why can't I edit?
public editing note:
heading: Public editing
- text: Currently your edits are anonymous and people cannot send you messages
+ html: Currently your edits are anonymous and people cannot send you messages
or see your location. To show what you edited and allow people to contact
you through the website, click the button below. Since the 0.6 API changeover,
- only public users can edit map data. (find
+ only public users can edit map data. (find
out why).- Your e-mail address will not be revealed by becoming
public.
- This action cannot be reversed and all new users are now
public by default.
@@ -2016,7 +2182,7 @@ en-GB:
image: 'Image:'
gravatar:
gravatar: Use Gravatar
- link: http://wiki.openstreetmap.org/wiki/Gravatar
+ link: https://wiki.openstreetmap.org/wiki/Gravatar
link text: what is this?
disabled: Gravatar has been disabled.
enabled: Display of your Gravatar has been enabled.
@@ -2066,25 +2232,14 @@ en-GB:
flash success: Home location saved successfully
go_public:
flash success: All your edits are now public, and you are now allowed to edit.
- make_friend:
- heading: Add %{user} as a friend?
- button: Add as friend
- success: '%{name} is now your friend!'
- failed: Sorry, failed to add %{name} as a friend.
- already_a_friend: You are already friends with %{name}.
- remove_friend:
- heading: Unfriend %{user}?
- button: Unfriend
- success: '%{name} was removed from your friends.'
- not_a_friend: '%{name} is not one of your friends.'
index:
title: Users
heading: Users
showing:
one: Page %{page} (%{first_item} of %{items})
other: Page %{page} (%{first_item}-%{last_item} of %{items})
- summary: '%{name} created from %{ip_address} on %{date}'
- summary_no_ip: '%{name} created on %{date}'
+ summary_html: '%{name} created from %{ip_address} on %{date}'
+ summary_no_ip_html: '%{name} created on %{date}'
confirm: Confirm Selected Users
hide: Hide Selected Users
empty: No matching users found
@@ -2092,7 +2247,7 @@ en-GB:
title: Account Suspended
heading: Account Suspended
webmaster: webmaster
- body: |-
+ body_html: |-
Sorry, your account has been automatically suspended due to suspicious activity.
@@ -2144,13 +2299,12 @@ en-GB:
back: Back to index
new:
title: Creating block on %{name}
- heading: Creating block on %{name}
+ heading_html: Creating block on %{name}
reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
as possible, giving as much detail as you can about the situation, remembering
that the message will be publicly visible. Bear in mind that not all users
understand the community jargon, so please try to use laymans terms.
period: How long, starting now, the user will be blocked from the API for.
- submit: Create block
tried_contacting: I have contacted the user and asked them to stop.
tried_waiting: I have given a reasonable amount of time for the user to respond
to those communications.
@@ -2158,13 +2312,12 @@ en-GB:
back: View all blocks
edit:
title: Editing block on %{name}
- heading: Editing block on %{name}
+ heading_html: Editing block on %{name}
reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
as possible, giving as much detail as you can about the situation. Bear in
mind that not all users understand the community jargon, so please try to
use laymans terms.
period: How long, starting now, the user will be blocked from the API for.
- submit: Update block
show: View this block
back: View all blocks
needs_view: Does the user need to log in before this block will be cleared?
@@ -2187,35 +2340,33 @@ en-GB:
empty: No blocks have been made yet.
revoke:
title: Revoking block on %{block_on}
- heading: Revoking block on %{block_on} by %{block_by}
+ heading_html: Revoking block on %{block_on} by %{block_by}
time_future: This block will end in %{time}.
- past: This block ended %{time} ago and cannot be revoked now.
+ past: This block ended %{time} and cannot be revoked now.
confirm: Are you sure you wish to revoke this block?
revoke: Revoke!
flash: This block has been revoked.
- period:
- one: 1 hour
- other: '%{count} hours'
helper:
time_future: Ends in %{time}.
until_login: Active until the user logs in.
time_future_and_until_login: Ends in %{time} and after the user has logged in.
- time_past: Ended %{time} ago.
+ time_past: Ended %{time}.
+ block_duration:
+ hours:
+ one: 1 hour
+ other: '%{count} hours'
blocks_on:
title: Blocks on %{name}
- heading: List of blocks on %{name}
+ heading_html: List of blocks on %{name}
empty: '%{name} has not been blocked yet.'
blocks_by:
title: Blocks by %{name}
- heading: List of blocks by %{name}
+ heading_html: List of blocks by %{name}
empty: '%{name} has not made any blocks yet.'
show:
title: '%{block_on} blocked by %{block_by}'
- heading: '%{block_on} blocked by %{block_by}'
- time_future: Ends in %{time}
- time_past: Ended %{time} ago
+ heading_html: '%{block_on} blocked by %{block_by}'
created: Created
- ago: '%{time} ago'
status: Status
show: Show
edit: Edit
@@ -2240,37 +2391,15 @@ en-GB:
next: Next »
previous: « Previous
notes:
- comment:
- opened_at_html: Created %{when} ago
- opened_at_by_html: Created %{when} ago by %{user}
- commented_at_html: Updated %{when} ago
- commented_at_by_html: Updated %{when} ago by %{user}
- closed_at_html: Resolved %{when} ago
- closed_at_by_html: Resolved %{when} ago by %{user}
- reopened_at_html: Reactivated %{when} ago
- reopened_at_by_html: Reactivated %{when} ago by %{user}
- rss:
- title: OpenStreetMap Notes
- description_area: A list of notes, reported, commented on or closed in your
- area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
- description_item: An rss feed for note %{id}
- opened: new note (near %{place})
- commented: new comment (near %{place})
- closed: closed note (near %{place})
- reopened: reactivated note (near %{place})
- entry:
- comment: Comment
- full: Full note
- mine:
+ index:
title: Notes submitted or commented on by %{user}
heading: '%{user}''s notes'
- subheading: Notes submitted or commented on by %{user}
+ subheading_html: Notes submitted or commented on by %{user}
id: Id
creator: Creator
description: Description
created_at: Created at
last_changed: Last changed
- ago_html: '%{when} ago'
javascripts:
close: Close
share:
@@ -2305,7 +2434,6 @@ en-GB:
out: Zoom Out
locate:
title: Show My Location
- popup: You are within {distance} {unit} of this point
base:
standard: Standard
cycle_map: Cycle Map
@@ -2340,8 +2468,7 @@ en-GB:
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.)
+ the problem.
advice: Your note is public and may be used to update the map, so don't enter
personal information or information from copyrighted maps or directory listings.
add: Add Note
@@ -2358,19 +2485,16 @@ en-GB:
directions:
ascend: Ascend
engines:
+ fossgis_osrm_car: Car (OSRM)
graphhopper_bicycle: Bicycle (GraphHopper)
graphhopper_car: Car (GraphHopper)
graphhopper_foot: Foot (GraphHopper)
- mapquest_bicycle: Bicycle (MapQuest)
- mapquest_car: Car (MapQuest)
- mapquest_foot: Foot (MapQuest)
- osrm_car: Car (OSRM)
descend: Descend
directions: Directions
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}
@@ -2408,7 +2532,7 @@ en-GB:
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 on %{name}
@@ -2418,6 +2542,17 @@ en-GB:
roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
unnamed: unnamed road
courtesy: Directions courtesy of %{link}
+ exit_counts:
+ first: 1st
+ second: 2nd
+ third: 3rd
+ fourth: 4th
+ fifth: 5th
+ sixth: 6th
+ seventh: 7th
+ eighth: 8th
+ ninth: 9th
+ tenth: 10Ñи
time: Time
query:
node: Node
@@ -2437,7 +2572,6 @@ en-GB:
edit:
description: Description
heading: Edit redaction
- submit: Save redaction
title: Edit redaction
index:
empty: No redactions to show.
@@ -2446,7 +2580,6 @@ en-GB:
new:
description: Description
heading: Enter information for new redaction
- submit: Create redaction
title: Creating new redaction
show:
description: 'Description:'
@@ -2465,4 +2598,6 @@ en-GB:
this redaction before destroying it.
flash: Redaction destroyed.
error: There was an error destroying this redaction.
+ validations:
+ invalid_characters: ÑÑдÑÑжа невалидни Ñимволи
...