X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c32a63058c9caee42311a6ce5c0f88e5c31816b4..76bc5eba0617e36ebb853d24212543d0e1d4904d:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index ee1b21fe3..2ec5e27dd 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -349,59 +349,10 @@ 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: latlon: Results from Internal - uk_postcode: Results from NPEMap / FreeThe - Postcode ca_postcode: Results from Geocoder.CA osm_nominatim: Results from OpenStreetMap Nominatim @@ -976,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' @@ -1421,6 +1114,161 @@ en-GB: delete: deleted: 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. @@ -1453,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 @@ -1553,6 +1504,54 @@ en-GB: image: Image alt: Alt text url: URL + 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.' trace: visibility: private: Private (only shared as anonymous, unordered points) @@ -1597,7 +1596,6 @@ en-GB: 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 @@ -1648,7 +1646,6 @@ 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}' @@ -1686,7 +1683,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 @@ -1700,11 +1697,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. @@ -1948,7 +1945,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' @@ -2147,7 +2143,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. @@ -2208,20 +2204,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. @@ -2251,8 +2233,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 @@ -2386,14 +2382,14 @@ en-GB: instructions: continue_without_exit: Continue on %{name} slight_right_without_exit: Slight right onto %{name} - offramp_right_without_exit: Take the sliproad on the right onto %{name} + offramp_right: Take the sliproad on the right + offramp_right_with_name: Take the sliproad on the right onto %{name} offramp_right_with_directions: Take the sliproad on the right towards %{directions} - offramp_right_with_name_and_directions: Take the sliproad on the right onto - %{name}, towards %{directions} - offramp_right_without_directions: Take the sliproad on the right + offramp_right_with_name_directions: Take the sliproad on the right onto %{name}, + towards %{directions} onramp_right_without_exit: Turn right on the sliproad onto %{name} onramp_right_with_directions: Turn right onto the sliproad towards %{directions} - onramp_right_with_name_and_directions: Turn right on the sliproad onto %{name}, + onramp_right_with_name_directions: Turn right on the sliproad onto %{name}, towards %{directions} onramp_right_without_directions: Turn right onto the sliproad endofroad_right_without_exit: At the end of the road turn right onto %{name} @@ -2404,14 +2400,14 @@ en-GB: uturn_without_exit: U-turn along %{name} sharp_left_without_exit: Sharp left onto %{name} turn_left_without_exit: Turn left onto %{name} - offramp_left_without_exit: Take the sliproad on the left onto %{name} + offramp_left: Take the sliproad on the left + offramp_left_with_name: Take the sliproad on the left onto %{name} offramp_left_with_directions: Take the sliproad on the left towards %{directions} - offramp_left_with_name_and_directions: Take the sliproad on the left onto - %{name}, towards %{directions} - offramp_left_without_directions: Take the sliproad on the left + offramp_left_with_name_directions: Take the sliproad on the left onto %{name}, + towards %{directions} onramp_left_without_exit: Turn left on the sliproad onto %{name} onramp_left_with_directions: Turn left onto the sliproad towards %{directions} - onramp_left_with_name_and_directions: Turn left on the sliproad onto %{name}, + onramp_left_with_name_directions: Turn left on the sliproad onto %{name}, towards %{directions} onramp_left_without_directions: Turn left onto the sliproad endofroad_left_without_exit: At the end of the road turn left onto %{name} @@ -2450,7 +2446,7 @@ en-GB: show_address: Show address query_features: Query features centre_map: Centre map here - redaction: + redactions: edit: description: Description heading: Edit redaction