X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5fb55b8a05f1a8f7a1541e1c1aaaf61b6e4387e5..6b44a1976cf07ba50ba8aed8b34434e69a45e62d:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2d5fd313c..3d2bf36b7 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -349,53 +349,6 @@ en-GB: ago: '%{ago} ago' newer_comments: Newer Comments older_comments: Older Comments - export: - title: Export - start: - area_to_export: Area to Export - manually_select: Manually select a different area - format_to_export: Format to Export - osm_xml_data: OpenStreetMap XML Data - map_image: Map Image (shows standard layer) - embeddable_html: Embeddable HTML - licence: Licence - export_details: 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 - listed below:' - body: This area is too large to be exported as OpenStreetMap XML Data. Please - zoom in or select a smaller area, or use one of the sources listed below - for bulk data downloads. - planet: - title: Planet OSM - description: Regularly updated copies of the complete OpenStreetMap database - overpass: - title: Overpass API - description: Download this bounding box from a mirror of the OpenStreetMap - database - geofabrik: - title: Geofabrik Downloads - description: Regularly-updated extracts of continents, countries, and selected - cities - metro: - title: Metro Extracts - description: Extracts for major world cities and their surrounding areas - other: - title: Other Sources - description: Additional sources listed on the OpenStreetMap wiki - options: Options - format: Format - scale: Scale - max: max - image_size: Image Size - zoom: Zoom - add_marker: Add a marker to the map - latitude: 'Lat:' - longitude: 'Lon:' - output: Output - paste_html: Paste HTML to embed in website - export_button: Export geocoder: search: title: @@ -974,264 +927,6 @@ en-GB: text: Make a Donation learn_more: Learn More more: More - license_page: - foreign: - title: About this translation - text: 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 - back to the %{native_link} of this page or you can stop reading about copyright - and %{mapping_link}. - native_link: British English version - mapping_link: start mapping - legal_babble: - title_html: Copyright and Licence - intro_1_html: |- - OpenStreetMap® is open data, licensed under the Open Data - Commons Open Database License (ODbL) by the 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). - credit_title_html: How to credit OpenStreetMap - credit_1_html: |- - We require that you use the credit “© OpenStreetMap - contributors”. - credit_2_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. - 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: |- - For a browsable electronic map, the credit should appear in the corner of the map. - For example: - attribution_example: - alt: Example of how to attribute OpenStreetMap on a webpage - title: Attribution example - 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. - more_2_html: |- - Although OpenStreetMap is open data, we cannot provide a - free-of-charge map API for third-parties. - See our API Usage Policy, - Tile Usage Policy - and Nominatim Usage Policy. - contributors_title_html: Our contributors - contributors_intro_html: |- - Our contributors are thousands of individuals. We also include - openly-licenced data from national mapping agencies - and other sources, among them: - contributors_at_html: |- - Austria: Contains data from - Stadt Wien (under - CC BY), - Land Vorarlberg and - Land Tirol (under CC BY AT with amendments). - contributors_ca_html: |- - Canada: Contains data from - GeoBase®, GeoGratis (© Department of Natural - Resources Canada), CanVec (© Department of Natural - Resources Canada), and StatCan (Geography Division, - Statistics Canada). - contributors_fi_html: |- - Finland: Contains data from the - National Land Survey of Finland's Topographic Database - and other datasets, under the - NLSFI Licence. - contributors_fr_html: 'France: Contains data sourced from 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_si_html: |- - Slovenia: Contains data from the - Surveying and Mapping Authority and - Ministry of Agriculture, Forestry and Food - (public information of Slovenia). - contributors_za_html: 'South Africa: Contains data sourced - 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.' - contributors_footer_1_html: For further details of these, and other sources - 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, - or accepts any liability. - infringement_title_html: Copyright infringement - infringement_1_html: OSM contributors are reminded never to add data from any - copyrighted sources (e.g. Google Maps or printed maps) without explicit 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 - 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. - welcome_page: - title: Welcome! - introduction_html: Welcome to OpenStreetMap, the free and editable map of the - world. Now that you're signed up, you're all set to get started mapping. Here's - a quick guide with the most important things you need to know. - whats_on_the_map: - title: What's on the Map - on_html: OpenStreetMap is a place for mapping things that are both real - and current - it includes millions of buildings, roads, and other details - about places. You can map whatever real-world features are interesting to - you. - off_html: What it doesn't include is opinionated data like ratings, - historical or hypothetical features, and data from copyrighted sources. Unless - you have special permission, don't copy from online or paper maps. - basic_terms: - title: Basic Terms For Mapping - paragraph_1_html: OpenStreetMap has some of its own lingo. Here are a few key - words that'll come in handy. - editor_html: An editor is a program or website you can use - to edit the map. - node_html: A node is a point on the map, like a single restaurant - or a tree. - way_html: A way is a line or area, like a road, stream, lake - or building. - tag_html: A tag is a bit of data about a node or way, like - a restaurant's name or a road's speed limit. - rules: - title: Rules! - paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants - to collaborate\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 - 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. - start_mapping: Start Mapping - add_a_note: - title: No Time To Edit? Add a Note! - paragraph_1_html: If you just want something small fixed and don't have the - time to sign up and learn how to edit, it's easy to add a note. - paragraph_2_html: 'Just go to the map and click the - note icon: . This will add a marker to the - map, which you can move by dragging. Add your message, then click save, and - other mappers will investigate.' - fixthemap: - title: Report a problem/Fix the map - how_to_help: - title: How to Help - join_the_community: - title: Join the community - explanation_html: If you have noticed a problem with our map data, for example - a road is missing or your address, the best way to proceed is to join the - OpenStreetMap community and add or repair the data yourself. - add_a_note: - instructions_html: Just click or the same icon on - the map display. This will add a marker to the map, which you can move by - dragging. Add your message, then click save, and other mappers will investigate. - other_concerns: - 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 - working group." - help_page: - title: Getting Help - introduction: OpenStreetMap has several resources for learning about the project, - asking and answering questions, and collaboratively discussing and documenting - mapping topics. - welcome: - url: /welcome - title: Welcome to OSM - description: Start with this quick guide covering the OpenStreetMap basics. - beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide - title: Beginners' Guide - description: Community maintained guide for beginners. - help: - url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Ask a question or look up answers on OSM's question-and-answer - site. - mailing_lists: - title: Mailing Lists - description: Ask a question or discuss interesting matters on a wide range of - topical or regional mailing lists. - forums: - title: Forums - description: Questions and discussions for those that prefer a bulletin board - style interface. - irc: - title: IRC - description: Interactive chat in many different languages and on many topics. - switch2osm: - title: switch2osm - description: Help for companies and organisations switching to OpenStreetMap - based maps and other services. - wiki: - url: http://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Browse the wiki for in-depth OSM documentation. - about_page: - next: Next - copyright_html: ©OpenStreetMap
contributors - used_by: '%{name} powers map data on thousands of web sites, mobile apps, and - hardware devices' - lede_text: OpenStreetMap is built by a community of mappers that contribute and - maintain data about roads, trails, cafés, railway stations, and much more, all - over the world. - local_knowledge_title: Local Knowledge - local_knowledge_html: |- - OpenStreetMap emphasises local knowledge. Contributors use - aerial imagery, GPS devices, and low-tech field maps to verify that OSM - is accurate and up to date. - 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. - open_data_title: Open Data - open_data_html: |- - OpenStreetMap is open data: you are free to use it for any purpose - as long as you credit OpenStreetMap and its contributors. If you alter or - build upon the data in certain ways, you may distribute the result only - 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 (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." - partners_title: Partners notifier: diary_comment_notification: subject: '[OpenStreetMap] %{user} commented on a diary entry' @@ -1343,7 +1038,7 @@ en-GB: details: More details about the changeset can be found at %{url}. unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe". - message: + messages: inbox: title: Inbox my_inbox: My Inbox @@ -1365,7 +1060,7 @@ en-GB: unread_button: Mark as unread read_button: Mark as read reply_button: Reply - delete_button: Delete + destroy_button: Delete new: title: Send message send_message_to: Send a new message to %{name} @@ -1398,27 +1093,182 @@ en-GB: wrong_user: You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply. - read: + show: title: Read message from: From subject: Subject date: Date reply_button: Reply unread_button: Mark as unread - delete_button: Delete + destroy_button: Delete back: Back to: To wrong_user: You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it. sent_message_summary: - delete_button: Delete + destroy_button: Delete mark: as_read: Message marked as read as_unread: Message marked as unread - delete: - deleted: Message deleted + destroy: + destroyed: Message deleted site: + about: + next: Next + copyright_html: ©OpenStreetMap
contributors + used_by: '%{name} powers map data on thousands of web sites, mobile apps, and + hardware devices' + lede_text: OpenStreetMap is built by a community of mappers that contribute + and maintain data about roads, trails, cafés, railway stations, and much more, + all over the world. + local_knowledge_title: Local Knowledge + local_knowledge_html: |- + OpenStreetMap emphasises local knowledge. Contributors use + aerial imagery, GPS devices, and low-tech field maps to verify that OSM + is accurate and up to date. + 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. + open_data_title: Open Data + open_data_html: |- + OpenStreetMap is open data: you are free to use it for any purpose + as long as you credit OpenStreetMap and its contributors. If you alter or + build upon the data in certain ways, you may distribute the result only + 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 + (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." + partners_title: Partners + copyright: + foreign: + title: About this translation + text: 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 + back to the %{native_link} of this page or you can stop reading about copyright + and %{mapping_link}. + native_link: British English version + mapping_link: start mapping + legal_babble: + title_html: Copyright and Licence + intro_1_html: |- + OpenStreetMap® is open data, licensed under the Open Data + Commons Open Database License (ODbL) by the 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). + credit_title_html: How to credit OpenStreetMap + credit_1_html: |- + We require that you use the credit “© OpenStreetMap + contributors”. + credit_2_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. + 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: |- + For a browsable electronic map, the credit should appear in the corner of the map. + For example: + attribution_example: + alt: Example of how to attribute OpenStreetMap on a webpage + title: Attribution example + 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. + more_2_html: |- + Although OpenStreetMap is open data, we cannot provide a + free-of-charge map API for third-parties. + See our API Usage Policy, + Tile Usage Policy + and Nominatim Usage Policy. + contributors_title_html: Our contributors + contributors_intro_html: |- + Our contributors are thousands of individuals. We also include + openly-licenced data from national mapping agencies + and other sources, among them: + contributors_at_html: |- + Austria: Contains data from + Stadt Wien (under + CC BY), + Land Vorarlberg and + Land Tirol (under CC BY AT with amendments). + contributors_ca_html: |- + Canada: Contains data from + GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), and StatCan (Geography Division, + Statistics Canada). + contributors_fi_html: |- + Finland: Contains data from the + National Land Survey of Finland's Topographic Database + and other datasets, under the + NLSFI Licence. + contributors_fr_html: 'France: Contains data sourced from + 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_si_html: |- + Slovenia: Contains data from the + Surveying and Mapping Authority and + Ministry of Agriculture, Forestry and Food + (public information of Slovenia). + contributors_za_html: 'South Africa: Contains data sourced + 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.' + contributors_footer_1_html: For further details of these, and other sources + 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, + or accepts any liability. + infringement_title_html: Copyright infringement + infringement_1_html: OSM contributors are reminded never to add data from + any copyrighted sources (e.g. Google Maps or printed maps) without explicit + 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 + 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. index: js_1: You are either using a browser that does not support JavaScript, or you have disabled JavaScript. @@ -1451,6 +1301,109 @@ en-GB: id_not_configured: iD has not been configured no_iframe_support: Your browser doesn't support HTML iframes, which are necessary for this feature. + export: + title: Export + area_to_export: Area to Export + manually_select: Manually select a different area + format_to_export: Format to Export + osm_xml_data: OpenStreetMap XML Data + map_image: Map Image (shows standard layer) + embeddable_html: Embeddable HTML + licence: Licence + export_details: 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 + listed below:' + body: This area is too large to be exported as OpenStreetMap XML Data. Please + zoom in or select a smaller area, or use one of the sources listed below + for bulk data downloads. + planet: + title: Planet OSM + description: Regularly updated copies of the complete OpenStreetMap database + overpass: + title: Overpass API + description: Download this bounding box from a mirror of the OpenStreetMap + database + geofabrik: + title: Geofabrik Downloads + description: Regularly-updated extracts of continents, countries, and selected + cities + metro: + title: Metro Extracts + description: Extracts for major world cities and their surrounding areas + other: + title: Other Sources + description: Additional sources listed on the OpenStreetMap wiki + options: Options + format: Format + scale: Scale + max: max + image_size: Image Size + zoom: Zoom + add_marker: Add a marker to the map + latitude: 'Lat:' + longitude: 'Lon:' + output: Output + paste_html: Paste HTML to embed in website + export_button: Export + fixthemap: + title: Report a problem/Fix the map + how_to_help: + title: How to Help + join_the_community: + title: Join the community + explanation_html: If you have noticed a problem with our map data, for example + a road is missing or your address, the best way to proceed is to join + the OpenStreetMap community and add or repair the data yourself. + add_a_note: + instructions_html: Just click or the same icon + on the map display. This will add a marker to the map, which you can move + by dragging. Add your message, then click save, and other mappers will + investigate. + other_concerns: + 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 + working group." + help: + title: Getting Help + introduction: OpenStreetMap has several resources for learning about the project, + asking and answering questions, and collaboratively discussing and documenting + mapping topics. + welcome: + url: /welcome + title: Welcome to OSM + description: Start with this quick guide covering the OpenStreetMap basics. + beginners_guide: + url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + title: Beginners' Guide + description: Community maintained guide for beginners. + help: + url: https://help.openstreetmap.org/ + title: help.openstreetmap.org + description: Ask a question or look up answers on OSM's question-and-answer + site. + mailing_lists: + title: Mailing Lists + description: Ask a question or discuss interesting matters on a wide range + of topical or regional mailing lists. + forums: + title: Forums + description: Questions and discussions for those that prefer a bulletin board + style interface. + irc: + title: IRC + description: Interactive chat in many different languages and on many topics. + switch2osm: + title: switch2osm + description: Help for companies and organisations switching to OpenStreetMap + based maps and other services. + wiki: + url: http://wiki.openstreetmap.org/ + title: wiki.openstreetmap.org + description: Browse the wiki for in-depth OSM documentation. sidebar: search_results: Search Results close: Close @@ -1551,18 +1504,84 @@ en-GB: image: Image alt: Alt text url: URL - trace: + welcome: + title: Welcome! + introduction_html: Welcome to OpenStreetMap, the free and editable map of the + world. Now that you're signed up, you're all set to get started mapping. Here's + a quick guide with the most important things you need to know. + whats_on_the_map: + title: What's on the Map + on_html: OpenStreetMap is a place for mapping things that are both real + and current - it includes millions of buildings, roads, and other details + about places. You can map whatever real-world features are interesting to + you. + off_html: What it doesn't include is opinionated data like ratings, + historical or hypothetical features, and data from copyrighted sources. + Unless you have special permission, don't copy from online or paper maps. + basic_terms: + title: Basic Terms For Mapping + paragraph_1_html: OpenStreetMap has some of its own lingo. Here are a few + key words that'll come in handy. + editor_html: An editor is a program or website you can use + to edit the map. + node_html: A node is a point on the map, like a single restaurant + or a tree. + way_html: A way is a line or area, like a road, stream, lake + or building. + tag_html: A tag is a bit of data about a node or way, like + a restaurant's name or a road's speed limit. + rules: + title: Rules! + paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants + to collaborate\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 + 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. + start_mapping: Start Mapping + add_a_note: + title: No Time To Edit? Add a Note! + paragraph_1_html: If you just want something small fixed and don't have the + time to sign up and learn how to edit, it's easy to add a note. + paragraph_2_html: 'Just go to the map and click + the note icon: . This will add a marker + to the map, which you can move by dragging. Add your message, then click + save, and other mappers will investigate.' + traces: visibility: private: Private (only shared as anonymous, unordered points) public: Public (shown in trace list and as anonymous, unordered points) trackable: Trackable (only shared as anonymous, ordered points with timestamps) 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 + help: Help + help_url: http://wiki.openstreetmap.org/wiki/Upload create: upload_trace: Upload GPS Trace trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email 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. + 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} @@ -1581,28 +1600,6 @@ en-GB: visibility: 'Visibility:' visibility_help: what does this mean? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces - trace_form: - 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 - help: Help - help_url: http://wiki.openstreetmap.org/wiki/Upload - trace_header: - upload_trace: Upload a trace - see_all_traces: See all traces - see_your_traces: See your traces - 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. - 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. trace_optionals: tags: Tags view: @@ -1646,13 +1643,14 @@ en-GB: map: map list: public_traces: Public GPS traces - your_traces: Your GPS traces public_traces_from: Public GPS traces from %{user} 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 page. + upload_trace: Upload a trace + see_all_traces: See all traces delete: scheduled_for_deletion: Trace scheduled for deletion make_public: @@ -1684,7 +1682,7 @@ en-GB: to the web interface to view the Contributor Terms. You do not need to agree, but you must view them. oauth: - oauthorize: + 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 @@ -1698,11 +1696,11 @@ en-GB: allow_write_gpx: upload GPS traces. allow_write_notes: modify notes. grant_access: Grant Access - oauthorize_success: + authorize_success: title: Authorisation request allowed allowed: You have granted application %{app_name} access to your account. verification: The verification code is %{code}. - oauthorize_failure: + authorize_failure: title: Authorisation request failed denied: You have denied application %{app_name} access to your account. invalid: The authorisation token is not valid. @@ -1946,7 +1944,6 @@ en-GB: if set location: Set your home location on the %{settings_link} page to see nearby users. settings_link_text: settings - your friends: Your friends no friends: You have not added any friends yet. km away: '%{count}km away' m away: '%{count}m away' @@ -2145,7 +2142,7 @@ en-GB: confirm: Confirm fail: Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid. - user_block: + user_blocks: model: non_moderator_update: Must be a moderator to create or update a block. non_moderator_revoke: Must be a moderator to revoke a block. @@ -2206,20 +2203,6 @@ en-GB: period: one: 1 hour other: '%{count} hours' - partial: - show: Show - edit: Edit - revoke: Revoke! - confirm: Are you sure? - display_name: Blocked User - creator_name: Creator - reason: Reason for block - status: Status - revoker_name: Revoked by - not_revoked: (not revoked) - showing_page: Page %{page} - next: Next » - previous: « Previous helper: time_future: Ends in %{time}. until_login: Active until the user logs in. @@ -2249,8 +2232,22 @@ en-GB: back: View all blocks revoker: 'Revoker:' needs_view: The user needs to log in before this block will be cleared. - note: - description: + block: + not_revoked: (not revoked) + show: Show + edit: Edit + revoke: Revoke! + blocks: + display_name: Blocked User + creator_name: Creator + reason: Reason for block + status: Status + revoker_name: Revoked by + showing_page: Page %{page} + 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 @@ -2426,11 +2423,6 @@ en-GB: against_oneway_without_exit: Go against one-way on %{name} end_oneway_without_exit: End of one-way on %{name} roundabout_with_exit: At roundabout take exit %{exit} onto %{name} - turn_left_with_exit: At roundabout turn left onto %{name} - slight_left_with_exit: At roundabout slight left onto %{name} - turn_right_with_exit: At roundabout turn right onto %{name} - slight_right_with_exit: At roundabout slight right onto %{name} - continue_with_exit: At roundabout continue straight onto %{name} unnamed: unnamed road courtesy: Directions courtesy of %{link} time: Time @@ -2448,7 +2440,7 @@ en-GB: show_address: Show address query_features: Query features centre_map: Centre map here - redaction: + redactions: edit: description: Description heading: Edit redaction