X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/87dfbda93261b50332381d0c0c685a71a3b897ad..76bc5eba0617e36ebb853d24212543d0e1d4904d:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 8a12d10a1..a2a575492 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -323,47 +323,6 @@ en: 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 licensed under the Open Data Commons Open Database License (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: @@ -1009,285 +968,6 @@ en: 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: THIS_LANGUAGE_NAME_HERE version - mapping_link: start mapping - legal_babble: - title_html: Copyright and License - 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 - licensed under the Creative - Commons Attribution-ShareAlike 2.0 license (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 License, and if using our map tiles, that the cartography is - licensed as CC BY-SA. You may do this by linking to - this copyright page. - Alternatively, and as a requirement if you are distributing OSM in a - data form, you can name and link directly to the license(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. - 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-licensed 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 License. - 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 see our Trademark Policy. - 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 - with, and communicate with, the community. If you are considering - any activities other than editing by hand, please read and follow the guidelines on - Imports and - Automated 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 - copyright page for more legal information, or contact the appropriate - OSMF 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: 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 site. - mailing_lists: - url: https://lists.openstreetmap.org/ - title: Mailing Lists - description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. - forums: - url: https://forum.openstreetmap.org/ - title: Forums - description: Questions and discussions for those that prefer a bulletin board style interface. - irc: - url: https://irc.openstreetmap.org/ - title: IRC - description: Interactive chat in many different languages and on many topics. - switch2osm: - url: https://switch2osm.org/ - title: switch2osm - description: Help for companies and organisations switching to OpenStreetMap based maps and other services. - wiki: - url: https://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 emphasizes 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 - 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 - 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 - License page for details. - legal_title: Legal - legal_html: | - This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) - on behalf of the community. Use of all OSMF operated services is subject - to our - Acceptable Use Policies and our Privacy Policy -
- Please contact the OSMF - if you have licensing, copyright or other legal questions. -
- OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. - partners_title: Partners notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on a diary entry" @@ -1446,6 +1126,175 @@ en: 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 emphasizes 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 + 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 + 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 + License page for details. + legal_title: Legal + legal_html: | + This site and many other related services are formally operated by the + OpenStreetMap Foundation (OSMF) + on behalf of the community. Use of all OSMF operated services is subject + to our + Acceptable Use Policies and our Privacy Policy +
+ Please contact the OSMF + if you have licensing, copyright or other legal questions. +
+ OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. + 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: THIS_LANGUAGE_NAME_HERE version + mapping_link: start mapping + legal_babble: + title_html: Copyright and License + 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 + licensed under the Creative + Commons Attribution-ShareAlike 2.0 license (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 License, and if using our map tiles, that the cartography is + licensed as CC BY-SA. You may do this by linking to + this copyright page. + Alternatively, and as a requirement if you are distributing OSM in a + data form, you can name and link directly to the license(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. + 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-licensed 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 License. + 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 see our Trademark Policy. index: js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript." js_2: "OpenStreetMap uses JavaScript for its slippy map." @@ -1470,6 +1319,103 @@ en: potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)" 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 licensed under the Open Data Commons Open Database License (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 + copyright page for more legal information, or contact the appropriate + OSMF 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: 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 site. + mailing_lists: + url: https://lists.openstreetmap.org/ + title: Mailing Lists + description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. + forums: + url: https://forum.openstreetmap.org/ + title: Forums + description: Questions and discussions for those that prefer a bulletin board style interface. + irc: + url: https://irc.openstreetmap.org/ + title: IRC + description: Interactive chat in many different languages and on many topics. + switch2osm: + url: https://switch2osm.org/ + title: switch2osm + description: Help for companies and organisations switching to OpenStreetMap based maps and other services. + wiki: + url: https://wiki.openstreetmap.org/ + title: wiki.openstreetmap.org + description: Browse the wiki for in-depth OSM documentation. sidebar: search_results: Search Results close: Close @@ -1570,6 +1516,59 @@ en: 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 + with, and communicate with, the community. If you are considering + any activities other than editing by hand, please read and follow the guidelines on + Imports and + Automated 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)" @@ -1636,6 +1635,7 @@ en: delete_track: "Delete this trace" trace_not_found: "Trace not found!" visibility: "Visibility:" + confirm_delete: "Delete this trace?" trace_paging_nav: showing_page: "Page %{page}" older: "Older Traces" @@ -1689,7 +1689,7 @@ en: blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." oauth: - oauthorize: + authorize: title: "Authorize 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." allow_to: "Allow the client application to:" @@ -1701,11 +1701,11 @@ en: allow_write_gpx: "upload GPS traces." allow_write_notes: "modify notes." grant_access: "Grant Access" - oauthorize_success: + authorize_success: title: "Authorization request allowed" allowed: "You have granted application %{app_name} access to your account." verification: "The verification code is %{code}." - oauthorize_failure: + authorize_failure: title: "Authorization request failed" denied: "You have denied application %{app_name} access to your account." invalid: "The authorization token is not valid." @@ -2107,7 +2107,7 @@ en: are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?" 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." @@ -2158,20 +2158,6 @@ en: 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." @@ -2201,8 +2187,22 @@ en: 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" @@ -2341,6 +2341,7 @@ en: onramp_right_with_directions: Turn right onto the ramp towards %{directions} onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions} onramp_right_without_directions: Turn right onto the ramp + onramp_right: Turn right onto the ramp endofroad_right_without_exit: At the end of the road turn right onto %{name} merge_right_without_exit: Merge right onto %{name} fork_right_without_exit: At the fork turn right onto %{name} @@ -2361,6 +2362,7 @@ en: onramp_left_with_directions: Turn left onto the ramp towards %{directions} onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions} onramp_left_without_directions: Turn left onto the ramp + onramp_left: Turn left onto the ramp endofroad_left_without_exit: At the end of the road turn left onto %{name} merge_left_without_exit: Merge left onto %{name} fork_left_without_exit: At the fork turn left onto %{name} @@ -2375,13 +2377,25 @@ en: 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} + turn_left_with_exit: Exit onto %{name} + slight_left_with_exit: Exit onto %{name} + turn_right_with_exit: Exit onto %{name} + slight_right_with_exit: Exit onto %{name} + continue_with_exit: Exit onto %{name} unnamed: "unnamed road" courtesy: "Directions courtesy of %{link}" + exit_counts: + one: "1st" + two: "2nd" + three: "3rd" + four: "4th" + five: "5th" + six: "6th" + seven: "7th" + eight: "8th" + nine: "9th" + ten: "10th" + gt_ten: "" time: "Time" query: node: Node @@ -2397,7 +2411,7 @@ en: show_address: Show address query_features: Query features centre_map: Centre map here - redaction: + redactions: edit: description: "Description" heading: "Edit redaction"