X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/90e2a144dca37f910eb70107158773a8c23ea469..f5b00499c04cc13ce483ed9118a83bfa9ee4d246:/config/locales/en-GB.yml?ds=sidebyside
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2a87a59b7..bba9c7d5a 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,6 +3,7 @@
# Export driver: phpyaml
# Author: Abijeet Patro
# Author: Andibing
+# Author: BEANS
# Author: Bpfhjquevaps
# Author: Bruce89
# Author: Caliburn
@@ -15,6 +16,7 @@
# Author: IknowJoseph
# Author: Jagwar
# Author: Jguthrie100
+# Author: Jlrb+
# Author: Kosovastar
# Author: Macofe
# Author: Meno25
@@ -38,6 +40,9 @@ en-GB:
create: Save
diary_entry:
create: Publish
+ update: Update
+ issue_comment:
+ create: Add Comment
message:
create: Send
client_application:
@@ -53,6 +58,10 @@ en-GB:
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
@@ -120,6 +129,45 @@ en-GB:
description: Description
languages: Languages
pass_crypt: Password
+ 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})'
@@ -197,6 +245,8 @@ 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}'
@@ -257,7 +307,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
@@ -265,8 +317,8 @@ 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}
- open_by_anonymous: Created by anonymous %{when}
+ 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}
@@ -313,9 +365,14 @@ en-GB:
comment:
comment: 'New comment on changeset #%{changeset_id} by %{author}'
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
@@ -363,11 +420,15 @@ en-GB:
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}
hide_link: Hide this comment
+ unhide_link: Unhide this comment
confirm: Confirm
+ report: Report this comment
location:
location: 'Location:'
view: View
@@ -408,12 +469,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
@@ -459,6 +527,7 @@ en-GB:
fuel: Fuel
gambling: Gambling
grave_yard: Graveyard
+ grit_bin: Grit Bin
hospital: Hospital
hunting_stand: Hunting Stand
ice_cream: Ice Cream
@@ -472,6 +541,7 @@ en-GB:
office: Office
parking: Parking
parking_entrance: Parking Entrance
+ parking_space: Parking Space
pharmacy: Pharmacy
place_of_worship: Place of Worship
police: Police
@@ -505,6 +575,7 @@ en-GB:
village_hall: Village Hall
waste_basket: Waste Bin
waste_disposal: Waste Disposal
+ water_point: Water Point
youth_centre: Youth Centre
boundary:
administrative: Administrative Boundary
@@ -533,25 +604,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
@@ -568,6 +645,7 @@ 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
@@ -576,6 +654,7 @@ en-GB:
trail: Trail
trunk: Trunk Road
trunk_link: Trunk Road
+ turning_loop: Turning Loop
unclassified: Unclassified Road
"yes": Road
historic:
@@ -595,6 +674,7 @@ en-GB:
manor: Manor
memorial: Memorial
mine: Mine
+ mine_shaft: Mine Shaft
monument: Monument
roman_road: Roman Road
ruins: Ruins
@@ -604,6 +684,7 @@ en-GB:
wayside_cross: Wayside Cross
wayside_shrine: Wayside Shrine
wreck: Wreck
+ "yes": Historic Site
junction:
"yes": Junction
landuse:
@@ -643,6 +724,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
@@ -667,16 +749,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:
@@ -722,11 +834,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
@@ -735,6 +850,7 @@ en-GB:
place:
allotments: Allotments
city: City
+ city_block: City Block
country: Country
county: County
farm: Farm
@@ -748,8 +864,10 @@ en-GB:
municipality: Municipality
neighbourhood: Neighbourhood
postcode: Postcode
+ quarter: Quarter
region: Region
sea: Sea
+ square: Square
state: State
subdivision: Subdivision
suburb: Suburb
@@ -788,6 +906,7 @@ en-GB:
beauty: Beauty Shop
beverages: Beverages Shop
bicycle: Bicycle Shop
+ bookmaker: Bookmaker
books: Book Shop
boutique: Boutique
butcher: Butcher
@@ -826,11 +945,16 @@ 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
@@ -838,15 +962,20 @@ 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
@@ -1614,8 +1743,8 @@ 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.
@@ -1688,7 +1817,7 @@ en-GB:
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