X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4035c790f85ac36214c5ed40efd69308c02844c7..0ff89c31e4f8a0c3fc31772c4cf914c4fd7f5656:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2a87a59b7..2ea39365a 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2,7 +2,10 @@
# Exported from translatewiki.net
# Export driver: phpyaml
# Author: Abijeet Patro
+# Author: Alefar
# Author: Andibing
+# Author: BEANS
+# Author: Bjh21
# Author: Bpfhjquevaps
# Author: Bruce89
# Author: Caliburn
@@ -15,13 +18,18 @@
# Author: IknowJoseph
# Author: Jagwar
# Author: Jguthrie100
+# Author: Jlrb+
# Author: Kosovastar
# Author: Macofe
+# Author: Maro21
# Author: Meno25
+# Author: Michel Bakni
# Author: Mvolz
# Author: Sampablokuper
+# Author: Samwilson
# Author: Shirayuki
# Author: Smsm1
+# Author: Tlubenov
# Author: TomH
# Author: دÙÙÙد
---
@@ -33,16 +41,21 @@ en-GB:
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: Edit
+ update: Update
redaction:
create: Create redaction
update: Save redaction
@@ -53,6 +66,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
@@ -61,6 +78,7 @@ en-GB:
diary_comment: Diary Comment
diary_entry: Diary Entry
friend: Friend
+ issue: Issue
language: Language
message: Message
node: Node
@@ -77,6 +95,7 @@ en-GB:
relation: Relation
relation_member: Relation Member
relation_tag: Relation Tag
+ report: Report
session: Session
trace: Trace
tracepoint: Trace Point
@@ -88,6 +107,18 @@ en-GB:
way_node: Way Node
way_tag: Way Tag
attributes:
+ client_application:
+ name: Name (Required)
+ url: Main Application URL (Required)
+ callback_url: 'Callback URL:'
+ support_url: Support URL
+ 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
diary_comment:
body: Body
diary_entry:
@@ -102,17 +133,23 @@ 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
body: Body
recipient: Recipient
+ report:
+ category: 'Select a reason for your report:'
+ details: Please provide some more details about the problem (required).
user:
email: E-mail
active: Active
@@ -120,6 +157,49 @@ en-GB:
description: Description
languages: Languages
pass_crypt: Password
+ pass_crypt_confirmation: Confirm 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})'
@@ -137,6 +217,15 @@ en-GB:
remote:
name: Remote Control
description: Remote Control (JOSM or Merkaartor)
+ auth:
+ providers:
+ none: None
+ openid: OpenID
+ google: Google
+ facebook: Facebook
+ windowslive: Windows Live
+ github: GitHub
+ wikipedia: Wikipedia
api:
notes:
comment:
@@ -178,6 +267,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
@@ -188,8 +279,8 @@ en-GB:
relation: Relations (%{count})
relation_paginated: Relations (%{x}-%{y} of %{count})
comment: Comments (%{count})
- hidden_commented_by: Hidden comment from %{user} %{when}
- commented_by: Comment from %{user} %{when}
+ hidden_commented_by_html: Hidden comment from %{user} %{when}
+ commented_by_html: Comment from %{user} %{when}
changesetxml: Changeset XML
osmchangexml: osmChange XML
feed:
@@ -197,31 +288,34 @@ 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:
+ title: Not Found
sorry: 'Sorry, %{type} #%{id} could not be found.'
type:
node: node
@@ -230,6 +324,7 @@ en-GB:
changeset: changeset
note: note
timeout:
+ title: Timeout Error
sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
type:
node: node
@@ -257,7 +352,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,16 +362,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}
- open_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}
+ opened_by_html: Created by %{user} %{when}
+ opened_by_anonymous_html: Created by anonymous %{when}
+ commented_by_html: Comment from %{user} %{when}
+ commented_by_anonymous_html: Comment from anonymous %{when}
+ closed_by_html: Resolved by %{user} %{when}
+ closed_by_anonymous_html: Resolved by anonymous %{when}
+ reopened_by_html: Reactivated by %{user} %{when}
+ reopened_by_anonymous_html: Reactivated by anonymous %{when}
+ hidden_by_html: 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.
@@ -313,20 +411,20 @@ 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
form:
- subject: 'Subject:'
- body: 'Body:'
- language: 'Language:'
location: 'Location:'
- latitude: 'Latitude:'
- longitude: 'Longitude:'
- use_map_link: use map
+ use_map_link: Use map
index:
title: Users' diaries
title_friends: Friends' diaries
@@ -335,6 +433,7 @@ en-GB:
in_language_title: Diary Entries in %{language}
new: New Diary Entry
new_title: Compose a new entry in my user diary
+ my_diary: My Diary
no_entries: No diary entries
recent_entries: Recent diary entries
older_entries: Older Entries
@@ -346,7 +445,7 @@ en-GB:
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
no_such_entry:
title: No such diary entry
@@ -354,20 +453,25 @@ en-GB:
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}
+ updated_at_html: Last updated on %{updated}.
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
@@ -389,17 +493,29 @@ en-GB:
comment: Comment
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:
@@ -408,12 +524,20 @@ en-GB:
chair_lift: Chairlift
drag_lift: Drag Lift
gondola: Gondola Lift
+ magic_carpet: Magic Carpet 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
@@ -427,7 +551,9 @@ en-GB:
bench: Bench
bicycle_parking: Cycle Parking
bicycle_rental: Cycle Rental
+ bicycle_repair_station: Bicycle Repair Station
biergarten: Beer Garden
+ blood_bank: Blood Bank
boat_rental: Boat Rental
brothel: Brothel
bureau_de_change: Bureau de Change
@@ -444,6 +570,7 @@ en-GB:
clock: Clock
college: College
community_centre: Community Centre
+ conference_centre: Conference Centre
courthouse: Court
crematorium: Crematorium
dentist: Dentist
@@ -451,6 +578,7 @@ en-GB:
drinking_water: Drinking Water
driving_school: Driving School
embassy: Embassy
+ events_venue: Events Venue
fast_food: Fast Food
ferry_terminal: Ferry Terminal
fire_station: Fire Station
@@ -459,38 +587,41 @@ 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: Internet Cafe
kindergarten: Nursery School
+ language_school: Language school
library: Library
+ loading_dock: Loading Dock
+ love_hotel: Love Hotel
marketplace: Marketplace
monastery: Monastery
+ money_transfer: Money Transfer
motorcycle_parking: Motorcycle Parking
+ music_school: 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_bath: Public Bath
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
@@ -505,12 +636,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": Boundary
bridge:
aqueduct: Aqueduct
boardwalk: Promenade
@@ -519,6 +651,22 @@ en-GB:
viaduct: Viaduct
"yes": Bridge
building:
+ apartment: Apartment
+ apartments: Apartments
+ bungalow: Bungalow
+ cabin: Cabin
+ chapel: Chapel
+ church: Church
+ college: College Building
+ commercial: Commercial Building
+ construction: Building under Construction
+ garage: Garage
+ garages: Garages
+ hospital: Hospital
+ hotel: Hotel
+ house: House
+ industrial: Industrial Building
+ roof: Roof
"yes": Building
craft:
brewery: Brewery
@@ -533,25 +681,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,14 +722,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:
@@ -591,10 +746,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
@@ -604,6 +759,7 @@ en-GB:
wayside_cross: Wayside Cross
wayside_shrine: Wayside Shrine
wreck: Wreck
+ "yes": Historic Site
junction:
"yes": Junction
landuse:
@@ -634,7 +790,6 @@ en-GB:
reservoir_watershed: Reservoir Watershed
residential: Residential Area
retail: Retail
- road: Road Area
village_green: Village Green
vineyard: Vineyard
"yes": Landuse
@@ -643,6 +798,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
@@ -654,6 +810,7 @@ en-GB:
miniature_golf: Miniature Golf
nature_reserve: Nature Reserve
park: Park
+ picnic_table: Picnic Table
pitch: Sports Pitch
playground: Playground
recreation_ground: Recreation Ground
@@ -667,16 +824,55 @@ en-GB:
water_park: Water Park
"yes": Leisure
man_made:
+ adit: Adit
+ advertising: Advertising
+ antenna: Antenna/Antennae
+ avalanche_protection: Avalanche Protection
+ beacon: Beacon
+ beam: Beam
+ beehive: Bee Hive
+ breakwater: Breakwater
+ bridge: Bridge
+ bunker_silo: Bunker
+ cairn: Cairn
+ chimney: Chimney
+ clearcut: Clearcut
+ communications_tower: Communications Tower
+ crane: Crane
+ cross: Cross
+ dolphin: Mooring Post
+ dyke: Dyke
+ embankment: Embankment
+ flagpole: Flagpole
+ gasometer: Gasometer
+ groyne: Groyne
+ kiln: Kiln
lighthouse: Lighthouse
+ manhole: Manhole
+ 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 +918,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 +934,7 @@ en-GB:
place:
allotments: Allotments
city: City
+ city_block: City Block
country: Country
county: County
farm: Farm
@@ -748,13 +948,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:
@@ -780,6 +981,7 @@ en-GB:
switch: Railway Points
tram: Tramway
tram_stop: Tram Stop
+ yard: Railway Yard
shop:
alcohol: Off Licence
antiques: Antiques
@@ -788,6 +990,7 @@ en-GB:
beauty: Beauty Shop
beverages: Beverages Shop
bicycle: Bicycle Shop
+ bookmaker: Bookmaker
books: Book Shop
boutique: Boutique
butcher: Butcher
@@ -812,12 +1015,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
@@ -826,11 +1027,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
@@ -838,15 +1043,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
@@ -903,11 +1112,6 @@ en-GB:
level8: City Boundary
level9: Village Boundary
level10: Suburb Boundary
- description:
- title:
- osm_nominatim: Location from OpenStreetMap
- Nominatim
- geonames: Location from GeoNames
types:
cities: Cities
towns: Towns
@@ -915,6 +1119,9 @@ en-GB:
results:
no_results: No results found
more_results: More results
+ issues:
+ index:
+ reports: Reports
layouts:
project_name:
title: OpenStreetMap
@@ -964,43 +1171,36 @@ en-GB:
text: Make a Donation
learn_more: Learn More
more: More
- notifier:
+ user_mailer:
diary_comment_notification:
subject: '[OpenStreetMap] %{user} commented on a diary entry'
hi: Hi %{to_user},
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.'
see_their_profile: You can see their profile at %{userurl}.
befriend_them: You can also add them as a friend at %{befriendurl}.
- gpx_notification:
- greeting: Hi,
- your_gpx_file: It looks like your GPX file
- with_description: with the description
- and_the_tags: 'and the following tags:'
- and_no_tags: and no tags.
- failure:
- subject: '[OpenStreetMap] GPX Import failure'
- failed_to_import: 'failed to import. Here is the error:'
- more_info_1: More information about GPX import failures and how to avoid
- more_info_2: 'them can be found at:'
- 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.
+ gpx_failure:
+ failed_to_import: 'failed to import. Here is the error:'
+ import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
+ subject: '[OpenStreetMap] GPX Import failure'
+ gpx_success:
+ 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.
+ subject: '[OpenStreetMap] GPX Import success'
signup_confirm:
subject: '[OpenStreetMap] Welcome to OpenStreetMap'
greeting: Hi there!
@@ -1011,28 +1211,16 @@ en-GB:
information to get you started.
email_confirm:
subject: '[OpenStreetMap] Confirm your e-mail address'
- email_confirm_plain:
- greeting: Hi,
- hopefully_you: Someone (hopefully you) would like to change their email address
- over at %{server_url} to %{new_address}.
- click_the_link: If this is you, please click the link below to confirm the change.
- email_confirm_html:
greeting: Hi,
hopefully_you: Someone (hopefully you) would like to change their email address
over at %{server_url} to %{new_address}.
click_the_link: If this is you, please click the link below to confirm the change.
lost_password:
subject: '[OpenStreetMap] Password reset request'
- lost_password_plain:
greeting: Hi,
hopefully_you: Someone (possibly you) has asked for the password to be reset
on this email address's openstreetmap.org account.
click_the_link: If this is you, please click the link below to reset your password.
- lost_password_html:
- greeting: Hi,
- hopefully_you: Someone (possibly you) has asked for the password to be reset
- on this e-mail address's openstreetmap.org account.
- click_the_link: If this is you, please click the link below to reset your password.
note_comment_notification:
anonymous: An anonymous user
greeting: Hi,
@@ -1089,8 +1277,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
@@ -1099,7 +1287,7 @@ 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
back_to_inbox: Back to inbox
@@ -1113,7 +1301,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:
@@ -1122,8 +1310,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
@@ -1153,8 +1341,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.
@@ -1175,26 +1363,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
+ 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 Terms
of Use, \nAcceptable
Use Policies and our Privacy
- Policy\n
\nPlease contact
- the OSMF \nif you have licensing, copyright or other legal questions.\n
\nOpenStreetMap,
- the magnifying glass logo and State of the Map are registered
- trademarks of the OSMF."
+ 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
@@ -1211,18 +1396,16 @@ en-GB:
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).
+ 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
+ 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
@@ -1230,7 +1413,7 @@ en-GB:
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:
@@ -1320,12 +1503,12 @@ 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_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.
@@ -1348,7 +1531,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
@@ -1598,11 +1781,6 @@ 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: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
help: Help
@@ -1614,26 +1792,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
- visibility: 'Visibility:'
visibility_help: what does this mean?
visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
trace_optionals:
@@ -1688,7 +1854,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
@@ -1719,9 +1885,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.
@@ -1733,7 +1899,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
@@ -1760,13 +1926,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
@@ -1776,25 +1935,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:
@@ -1809,7 +1956,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
@@ -1875,8 +2022,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?
@@ -1884,22 +2029,19 @@ 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
html: |-
Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.
Sign up to get started contributing. We'll send an email to confirm your account.
- license_agreement: When you confirm your account you will need to agree to the
- contributor
- 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.
@@ -1921,7 +2063,7 @@ en-GB:
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'
declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
decline: Decline
@@ -1969,8 +2111,8 @@ en-GB:
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'
@@ -2024,7 +2166,7 @@ en-GB:
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
@@ -2080,10 +2222,11 @@ en-GB:
reconfirm_html: If you need us to resend the confirmation email, click
here.
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.
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.
+ success_html: We've sent a new confirmation note to %{email} and as soon as
+ you confirm your account you'll be able to get mapping.
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 e-mail address
@@ -2097,25 +2240,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
@@ -2123,7 +2255,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.
@@ -2175,7 +2307,7 @@ 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
@@ -2188,7 +2320,7 @@ 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
@@ -2216,32 +2348,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} and cannot be revoked now.
confirm: Are you sure you wish to revoke this block?
revoke: Revoke!
flash: This block has been revoked.
helper:
- time_future: Ends in %{time}.
+ time_future_html: 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}.
+ time_future_and_until_login_html: Ends in %{time} and after the user has logged
+ in.
+ time_past_html: 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}'
+ heading_html: '%{block_on} blocked by %{block_by}'
created: Created
status: Status
show: Show
@@ -2267,7 +2400,7 @@ en-GB:
next: Next »
previous: « Previous
notes:
- mine:
+ index:
title: Notes submitted or commented on by %{user}
heading: '%{user}''s notes'
subheading_html: Notes submitted or commented on by %{user}
@@ -2310,7 +2443,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
@@ -2419,6 +2551,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: 10th
time: Time
query:
node: Node
@@ -2464,4 +2607,6 @@ en-GB:
this redaction before destroying it.
flash: Redaction destroyed.
error: There was an error destroying this redaction.
+ validations:
+ invalid_characters: contains invalid characters
...