X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d021bdf5cf57f6020279043ac276f96f5bf6352c..f1c31dac254bde0435c2ccd26baf91febe4835fb:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index c97d67866..9c0eb2c49 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 @@ -11,13 +12,18 @@ # 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: TomH @@ -36,6 +42,9 @@ en-GB: create: Save diary_entry: create: Publish + update: Update + issue_comment: + create: Add Comment message: create: Send client_application: @@ -51,6 +60,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 @@ -118,6 +131,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})' @@ -195,30 +247,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: @@ -255,7 +309,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 @@ -263,8 +319,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} @@ -311,9 +367,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 @@ -344,7 +405,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 @@ -352,7 +413,7 @@ 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} comment_link: Comment on this entry reply_link: Reply to this entry comment_count: @@ -361,11 +422,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} + 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 @@ -387,17 +452,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: @@ -406,12 +483,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 @@ -457,6 +541,7 @@ en-GB: fuel: Fuel gambling: Gambling grave_yard: Graveyard + grit_bin: Grit Bin hospital: Hospital hunting_stand: Hunting Stand ice_cream: Ice Cream @@ -470,6 +555,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 @@ -503,6 +589,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 @@ -531,25 +618,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 @@ -566,6 +659,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 @@ -574,6 +668,7 @@ en-GB: trail: Trail trunk: Trunk Road trunk_link: Trunk Road + turning_loop: Turning Loop unclassified: Unclassified Road "yes": Road historic: @@ -593,6 +688,7 @@ en-GB: manor: Manor memorial: Memorial mine: Mine + mine_shaft: Mine Shaft monument: Monument roman_road: Roman Road ruins: Ruins @@ -602,6 +698,7 @@ en-GB: wayside_cross: Wayside Cross wayside_shrine: Wayside Shrine wreck: Wreck + "yes": Historic Site junction: "yes": Junction landuse: @@ -641,6 +738,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 @@ -665,16 +763,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: @@ -720,11 +848,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 @@ -733,6 +864,7 @@ en-GB: place: allotments: Allotments city: City + city_block: City Block country: Country county: County farm: Farm @@ -746,8 +878,10 @@ en-GB: municipality: Municipality neighbourhood: Neighbourhood postcode: Postcode + quarter: Quarter region: Region sea: Sea + square: Square state: State subdivision: Subdivision suburb: Suburb @@ -786,6 +920,7 @@ en-GB: beauty: Beauty Shop beverages: Beverages Shop bicycle: Bicycle Shop + bookmaker: Bookmaker books: Book Shop boutique: Boutique butcher: Butcher @@ -824,11 +959,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 @@ -836,15 +976,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 @@ -852,7 +997,7 @@ en-GB: "yes": Shop tourism: alpine_hut: Alpine Hut - apartment: Holiday Apartment + apartment: Holiday Flat artwork: Artwork attraction: Attraction bed_and_breakfast: Bed and Breakfast @@ -977,7 +1122,7 @@ en-GB: subject %{subject}:' footer_html: You can also read the message at %{readurl} and you can reply at %{replyurl} - friend_notification: + 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.' @@ -1064,10 +1209,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}. @@ -1088,8 +1232,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 @@ -1098,7 +1242,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 @@ -1112,7 +1256,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: @@ -1121,8 +1265,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 @@ -1152,8 +1296,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} powers map data on thousands of web sites, mobile apps, + and hardware devices' lede_text: OpenStreetMap is built by a community of mappers that contribute and maintain data about roads, trails, cafés, railway stations, and much more, all over the world. @@ -1165,7 +1309,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 @@ -1174,26 +1318,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 @@ -1202,17 +1343,17 @@ 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. + 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 + licenced under the Creative Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). credit_title_html: How to credit OpenStreetMap credit_1_html: |- @@ -1222,7 +1363,7 @@ en-GB: 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. + 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 @@ -1238,9 +1379,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. @@ -1289,7 +1428,7 @@ en-GB: contributors_gb_html: 'United Kingdom: Contains Ordnance 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, @@ -1300,15 +1439,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. @@ -1322,12 +1460,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. @@ -1350,7 +1488,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 @@ -1405,7 +1543,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 @@ -1414,16 +1552,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 @@ -1441,9 +1579,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 @@ -1575,8 +1713,8 @@ 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? @@ -1606,9 +1744,9 @@ en-GB: tags_help: comma delimited visibility: 'Visibility:' visibility_help: what does this mean? - visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces + 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 @@ -1616,8 +1754,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. @@ -1665,7 +1803,9 @@ en-GB: newer: Newer Traces trace: pending: PENDING - count_points: '%{count} points' + count_points: + one: 1 point + other: '%{count} points' more: more trace_details: View Trace Details view_map: View Map @@ -1684,11 +1824,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 @@ -1719,9 +1859,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 +1873,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 @@ -1776,9 +1916,9 @@ 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: @@ -1809,7 +1949,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 @@ -1884,8 +2024,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 @@ -1897,9 +2037,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. @@ -1913,7 +2053,7 @@ 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: Terms heading: Terms @@ -1921,9 +2061,9 @@ 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: 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. @@ -1969,8 +2109,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' @@ -2013,21 +2153,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). @@ -2047,7 +2187,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. @@ -2097,25 +2237,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 +2252,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 +2304,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 +2317,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,7 +2345,7 @@ 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? @@ -2233,15 +2362,15 @@ en-GB: 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 @@ -2310,7 +2439,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