X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e2e79ba549a7c2f668ccb9b0fab7d6245cb826c5..299c59e34f4a9b59f5d1f02efacc37e4c8dd3bcf:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index 1c70e73b4..ec845dc7c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -154,46 +154,45 @@ en: reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms. needs_view: Does the user need to log in before this block will be cleared? user: - email_confirmation: 'Your address is not displayed publicly, see our privacy policy for more information.' new_email: "(never displayed publicly)" datetime: distance_in_words_ago: about_x_hours: - one: about 1 hour ago + one: about %{count} hour ago other: about %{count} hours ago about_x_months: - one: about 1 month ago + one: about %{count} month ago other: about %{count} months ago about_x_years: - one: about 1 year ago + one: about %{count} year ago other: about %{count} years ago almost_x_years: - one: almost 1 year ago + one: almost %{count} year ago other: almost %{count} years ago half_a_minute: half a minute ago less_than_x_seconds: - one: less than 1 second ago + one: less than %{count} second ago other: less than %{count} seconds ago less_than_x_minutes: - one: less than a minute ago + one: less than %{count} minute ago other: less than %{count} minutes ago over_x_years: - one: over 1 year ago + one: over %{count} year ago other: over %{count} years ago x_seconds: - one: 1 second ago + one: "%{count} second ago" other: "%{count} seconds ago" x_minutes: - one: 1 minute ago + one: "%{count} minute ago" other: "%{count} minutes ago" x_days: - one: 1 day ago + one: "%{count} day ago" other: "%{count} days ago" x_months: - one: 1 month ago + one: "%{count} month ago" other: "%{count} months ago" x_years: - one: 1 year ago + one: "%{count} year ago" other: "%{count} years ago" printable_name: with_id: "%{id}" @@ -213,7 +212,7 @@ en: openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live + microsoft: Microsoft github: GitHub wikipedia: Wikipedia api: @@ -229,6 +228,7 @@ en: reopened_at_by_html: "Reactivated %{when} by %{user}" rss: title: "OpenStreetMap Notes" + description_all: "A list of reported, commented on or closed notes" description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" description_item: "An rss feed for note %{id}" opened: "new note (near %{place})" @@ -300,22 +300,22 @@ en: browse: created: "Created" closed: "Closed" - created_html: "Created %{time}" - closed_html: "Closed %{time}" - created_by_html: "Created %{time} by %{user}" - deleted_by_html: "Deleted %{time} by %{user}" - edited_by_html: "Edited %{time} by %{user}" - closed_by_html: "Closed %{time} by %{user}" + created_ago_html: "Created %{time_ago}" + closed_ago_html: "Closed %{time_ago}" + created_ago_by_html: "Created %{time_ago} by %{user}" + closed_ago_by_html: "Closed %{time_ago} by %{user}" + deleted_ago_by_html: "Deleted %{time_ago} by %{user}" + edited_ago_by_html: "Edited %{time_ago} by %{user}" version: "Version" in_changeset: "Changeset" anonymous: "anonymous" no_comment: "(no comment)" part_of: "Part of" part_of_relations: - one: 1 relation + one: "%{count} relation" other: "%{count} relations" part_of_ways: - one: 1 way + one: "%{count} way" other: "%{count} ways" download_xml: "Download XML" view_history: "View History" @@ -333,8 +333,8 @@ en: relation: "Relations (%{count})" relation_paginated: "Relations (%{x}-%{y} of %{count})" comment: "Comments (%{count})" - hidden_commented_by_html: "Hidden comment from %{user} %{when}" - commented_by_html: "Comment from %{user} %{when}" + hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" + comment_by_html: "Comment from %{user} %{time_ago}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -351,6 +351,7 @@ en: history_title_html: "Way History: %{name}" nodes: "Nodes" nodes_count: + one: "%{count} node" other: "%{count} nodes" also_part_of_html: one: "part of way %{related_ways}" @@ -360,7 +361,7 @@ en: history_title_html: "Relation History: %{name}" members: "Members" members_count: - one: 1 member + one: "%{count} member" other: "%{count} members" relation_member: entry_html: "%{type} %{name}" @@ -516,9 +517,9 @@ en: comment_link: Comment on this entry reply_link: Send a message to the author comment_count: - zero: No comments one: "%{count} comment" other: "%{count} comments" + no_comments: No comments edit_link: Edit this entry hide_link: Hide this entry unhide_link: Unhide this entry @@ -591,9 +592,13 @@ en: geocoder: search: title: - latlon_html: 'Results from Internal' - osm_nominatim_html: 'Results from OpenStreetMap Nominatim' - osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim' + results_from_html: 'Results from %{results_link}' + latlon: Internal + latlon_url: https://openstreetmap.org/ + osm_nominatim: OpenStreetMap Nominatim + osm_nominatim_url: https://nominatim.openstreetmap.org/ + osm_nominatim_reverse: OpenStreetMap Nominatim + osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/ search_osm_nominatim: prefix_format: "%{name}" prefix: @@ -1387,11 +1392,10 @@ en: status: Status reports: Reports last_updated: Last Updated - last_updated_time_html: "%{time}" - last_updated_time_user_html: "%{time} by %{user}" + last_updated_time_ago_user_html: "%{time_ago} by %{user}" link_to_reports: View Reports reports_count: - one: "1 Report" + one: "%{count} Report" other: "%{count} Reports" reported_item: Reported Item states: @@ -1401,9 +1405,9 @@ en: show: title: "%{status} Issue #%{issue_id}" reports: - zero: No reports - one: 1 report + one: "%{count} report" other: "%{count} reports" + no_reports: No reports report_created_at: "First reported at %{datetime}" last_resolved_at: "Last resolved at %{datetime}" last_updated_at: "Last updated at %{datetime} by %{displayname}" @@ -1552,9 +1556,9 @@ en: subject: "[OpenStreetMap] GPX Import failure" gpx_success: hi: "Hi %{to_user}," - loaded_successfully: - one: loaded successfully with %{trace_points} out of a possible 1 point. - other: loaded successfully with %{trace_points} out of a possible %{possible_points} points. + loaded: + one: "loaded successfully with %{trace_points} out of a possible %{count} point." + other: "loaded successfully with %{trace_points} out of a possible %{count} points." subject: "[OpenStreetMap] GPX Import success" signup_confirm: subject: "[OpenStreetMap] Welcome to OpenStreetMap" @@ -1751,6 +1755,9 @@ en: home location: "Home Location" no home location: "You have not entered your home location." update home location on click: "Update home location when I click on the map?" + show: "Show" + delete: "Delete" + undelete: "Undo delete" update: success: Profile updated. failure: Couldn't update profile. @@ -1779,9 +1786,9 @@ en: facebook: title: Login with Facebook alt: Login with a Facebook Account - windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account + microsoft: + title: Login with Microsoft + alt: Login with a Microsoft Account github: title: Login with GitHub alt: Login with a GitHub Account @@ -1825,7 +1832,8 @@ en: site: about: next: Next - copyright_html: ©OpenStreetMap
contributors + heading_html: "%{copyright}OpenStreetMap %{br} contributors" + copyright_symbol_html: "©" used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices" lede_text: | OpenStreetMap is built by a community of mappers that contribute and maintain data @@ -1836,35 +1844,52 @@ en: 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: | + community_driven_1_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. + To learn more about the community, see the %{osm_blog_link}, + %{user_diaries_link}, %{community_blogs_link}, and the + %{osm_foundation_link} website. + community_driven_osm_blog: OpenStreetMap Blog + community_driven_osm_blog_url: https://blog.openstreetmap.org + community_driven_user_diaries: user diaries + community_driven_community_blogs: community blogs + community_driven_community_blogs_url: https://blogs.openstreetmap.org/ + community_driven_osm_foundation: OSM Foundation + community_driven_osm_foundation_url: https://www.osmfoundation.org/ open_data_title: Open Data - open_data_html: | - OpenStreetMap is open data: you are free to use it for any purpose + open_data_1_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. + under the same licence. See the %{copyright_license_link} for details. + open_data_open_data: open data + open_data_copyright_license: Copyright and License page legal_title: Legal - legal_1_html: | + legal_1_1_html: | This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) + %{openstreetmap_foundation_link} (OSMF) on behalf of the community. Use of all OSMF operated services is subject - to our Terms of Use, - Acceptable Use Policies and our Privacy Policy. - legal_2_html: | - Please contact the OSMF + to our %{terms_of_use_link}, %{aup_link} and our %{privacy_policy_link}. + legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation + legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/ + legal_1_1_terms_of_use: Terms of Use + legal_1_1_terms_of_use_url: https://wiki.osmfoundation.org/wiki/Terms_of_Use + legal_1_1_aup: Acceptable Use Policies + legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy + legal_1_1_privacy_policy: Privacy Policy + legal_1_1_privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy + legal_2_1_html: | + Please %{contact_the_osmf_link} 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. + legal_2_1_contact_the_osmf: contact the OSMF + legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact + legal_2_2_html: | + OpenStreetMap, the magnifying glass logo and State of the Map are %{registered_trademarks_link}. + legal_2_2_registered_trademarks: registered trademarks of the OSMF + legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy partners_title: Partners copyright: foreign: @@ -1878,122 +1903,166 @@ en: 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: | + introduction_1_html: | + OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the + %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF). + introduction_1_registered_trademark_html: "®" + introduction_1_open_data: open data + introduction_1_odc_odbl: Open Data Commons Open Database License + introduction_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/ + introduction_1_osm_foundation: OpenStreetMap Foundation + introduction_1_osm_foundation_url: https://osmfoundation.org/ + introduction_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_1_html: | - Our documentation is licensed under the - Creative - Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0). + full %{legal_code_link} explains your rights and responsibilities. + introduction_2_legal_code: legal code + introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/ + introduction_3_html: | + Our documentation is licensed under the %{creative_commons_link} license (CC BY-SA 2.0). + introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0 + introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/ credit_title_html: How to credit OpenStreetMap credit_1_html: | Where you use OpenStreetMap data, you are required to do the following two things: - credit_2_1_html: | - - credit_3_1_html: | + credit_2_1: Provide credit to OpenStreetMap by displaying our copyright notice. + credit_2_2: Make clear that the data is available under the Open Database License. + credit_3_html: | For the copyright notice, we have different requirements on how this should be displayed, depending on how you are using our data. For example, different rules apply on how to show the copyright notice depending on whether you have created a browsable map, a printed map or a static image. Full details on the - requirements can be found in the - Attribution - Guidelines. - credit_4_html: | + requirements can be found in the %{attribution_guidelines_link}. + credit_3_attribution_guidelines: Attribution Guidelines + credit_3_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines + credit_4_1_html: | To make clear that the data is available under the Open - Database License, you may link to - this copyright page. + Database License, you may link to %{this_copyright_page_link}. 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) and to opendatacommons.org. In this example, the credit appears in the corner of the map. + credit_4_1_this_copyright_page: this copyright page 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: | + more_1_1_html: Read more about using our data, and how to credit us, at the %{osmf_licence_page_link}. + more_1_1_osmf_licence_page: OSMF Licence page + more_1_1_osmf_licence_page_url: https://osmfoundation.org/Licence + more_2_1_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. + See our %{api_usage_policy_link}, %{tile_usage_policy_link} and %{nominatim_usage_policy_link}. + more_2_1_api_usage_policy: API Usage Policy + more_2_1_api_usage_policy_url: https://operations.osmfoundation.org/policies/api/ + more_2_1_tile_usage_policy: Tile Usage Policy + more_2_1_tile_usage_policy_url: https://operations.osmfoundation.org/policies/tiles/ + more_2_1_nominatim_usage_policy: Nominatim Usage Policy + more_2_1_nominatim_usage_policy_url: https://operations.osmfoundation.org/policies/nominatim/ 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_au_html: | - Australia: Incorporates or developed using Administrative Boundaries © - Geoscape Australia - licensed by the Commonwealth of Australia under - Creative Commons Attribution 4.0 International licence (CC BY 4.0). - contributors_ca_html: | - Canada: Contains data from + contributors_at_credit_html: | + %{austria}: Contains data from %{stadt_wien_link} (under %{cc_by_link}), %{land_vorarlberg_link} + and Land Tirol (under %{cc_by_at_with_amendments_link}). + contributors_at_austria: Austria + contributors_at_stadt_wien: Stadt Wien + contributors_at_stadt_wien_url: https://data.wien.gv.at/ + contributors_at_cc_by: CC BY + contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.de + contributors_at_land_vorarlberg: Land Vorarlberg + contributors_at_land_vorarlberg_url: https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm + contributors_at_cc_by_at_with_amendments: CC BY AT with amendments + contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/ + contributors_au_credit_html: | + %{australia}: Incorporates or developed using Administrative Boundaries © %{geoscape_australia_link} + licensed by the Commonwealth of Australia under %{cc_licence_link}. + contributors_au_australia: Australia + contributors_au_geoscape_australia: Geoscape Australia + contributors_au_geoscape_australia_url: https://geoscape.com.au/legal/data-copyright-and-disclaimer/ + contributors_au_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0) + contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/ + contributors_ca_credit_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 + contributors_ca_canada: Canada + contributors_fi_credit_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 + and other datasets, under the %{nlsfi_license_link}. + contributors_fi_finland: Finland + contributors_fi_nlsfi_license: NLSFI License + contributors_fi_nlsfi_license_url: https://www.maanmittauslaitos.fi/en/opendata-licence-version1 + contributors_fr_credit_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 the - LINZ Data Service and - licensed for reuse under - CC BY 4.0. - contributors_si_html: | - Slovenia: Contains data from the - Surveying and Mapping Authority and - Ministry of Agriculture, Forestry and Food + contributors_fr_france: France + contributors_nl_credit_html: | + %{netherlands}: Contains © AND data, 2007 (%{and_link}) + contributors_nl_netherlands: Netherlands + contributors_nl_and: www.and.com + contributors_nl_and_url: https://www.and.com + contributors_nz_credit_html: | + %{new_zealand}: Contains data sourced from the %{linz_data_service_link} + and licensed for reuse under %{cc_by_link}. + contributors_nz_new_zealand: New Zealand + contributors_nz_linz_data_service: LINZ Data Service + contributors_nz_linz_data_service_url: https://data.linz.govt.nz/ + contributors_nz_cc_by: CC BY 4.0 + contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/ + contributors_rs_credit_html: | + %{serbia}: Contains data from the %{rgz_link} and %{open_data_portal} + (public information of Serbia), 2018. + contributors_rs_serbia: Serbia + contributors_rs_rgz: Serbian Geodetic Authority + contributors_rs_rgz_url: https://geosrbija.rs/ + contributors_rs_open_data_portal: National Open Data Portal + contributors_rs_open_data_portal_url: https://data.gov.rs/sr/ + contributors_si_credit_html: | + %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link} (public information of Slovenia). - contributors_es_html: | - Spain: Contains data sourced from the - Spanish National Geographic Institute (IGN) and - National Cartographic System (SCNE) - licensed for reuse under CC BY 4.0. - 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 + contributors_si_slovenia: Slovenia + contributors_si_gu: Surveying and Mapping Authority + contributors_si_gu_url: https://www.gov.si/en/state-authorities/bodies-within-ministries/surveying-and-mapping-authority/ + contributors_si_mkgp: Ministry of Agriculture, Forestry and Food + contributors_si_mkgp_url: https://www.gov.si/en/state-authorities/ministries/ministry-of-agriculture-forestry-and-food/ + contributors_es_credit_html: | + %{spain}: Contains data sourced from the + Spanish National Geographic Institute (%{ign_link}) and + National Cartographic System (%{scne_link}) + licensed for reuse under %{cc_by_link}. + contributors_es_spain: Spain + contributors_es_ign: IGN + contributors_es_ign_url: https://www.ign.es/ + contributors_es_scne: SCNE + contributors_es_scne_url: https://www.scne.es/ + contributors_es_cc_by: CC BY 4.0 + contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/ + contributors_za_credit_html: | + %{south_africa}: Contains data sourced from %{ngi_link}, State copyright reserved. + contributors_za_south_africa: South Africa + contributors_za_ngi: "Chief Directorate: National Geo-Spatial Information" + contributors_za_ngi_url: https://ngi.dalrrd.gov.za/ + contributors_gb_credit_html: | + %{united_kingdom}: Contains Ordnance Survey data © Crown copyright and database right 2010-2023. - contributors_footer_1_html: | + contributors_gb_united_kingdom: United Kingdom + contributors_2_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. + to help improve OpenStreetMap, please see the %{contributors_page_link} on the OpenStreetMap Wiki. + contributors_2_contributors_page: Contributors page + contributors_2_contributors_page_url: https://wiki.openstreetmap.org/wiki/Contributors contributors_footer_2_html: | Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or @@ -2003,15 +2072,22 @@ en: 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: | + infringement_2_1_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. + to our %{takedown_procedure_link} or file directly at our + %{online_filing_page_link}. + infringement_2_1_takedown_procedure: takedown procedure + infringement_2_1_takedown_procedure_url: https://wiki.osmfoundation.org/wiki/Takedown_procedure + infringement_2_1_online_filing_page: on-line filing page + infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/ + trademarks_title: Trademarks + trademarks_1_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_link}. + trademarks_1_1_trademark_policy: Trademark Policy + trademarks_1_1_trademark_policy_url: https://wiki.osmfoundation.org/wiki/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." @@ -2081,8 +2157,8 @@ en: 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. + instructions_1_html: | + Just click %{note_icon} 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: @@ -2362,13 +2438,12 @@ en: visibility: "Visibility:" confirm_delete: "Delete this trace?" trace_paging_nav: - showing_page: "Page %{page}" older: "Older Traces" newer: "Newer Traces" trace: pending: "PENDING" count_points: - one: "1 point" + one: "%{count} point" other: "%{count} points" more: "more" trace_details: "View Trace Details" @@ -2563,6 +2638,10 @@ en: auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." continue: Sign Up terms accepted: "Thanks for accepting the new contributor terms!" + email_confirmation_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.' + privacy_policy: privacy policy + privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy + privacy_policy_title: OSMF privacy policy including section on email addresses terms: title: "Terms" heading: "Terms" @@ -2618,6 +2697,7 @@ en: remove as friend: Unfriend add as friend: Add Friend mapper since: "Mapper since:" + uid: "User id:" ct status: "Contributor terms:" ct undecided: Undecided ct declined: Declined @@ -2746,19 +2826,19 @@ en: time_past_html: "Ended %{time}." block_duration: hours: - one: "1 hour" + one: "%{count} hour" other: "%{count} hours" days: - one: "1 day" + one: "%{count} day" other: "%{count} days" weeks: - one: "1 week" + one: "%{count} week" other: "%{count} weeks" months: - one: "1 month" + one: "%{count} month" other: "%{count} months" years: - one: "1 year" + one: "%{count} year" other: "%{count} years" blocks_on: title: "Blocks on %{name}" @@ -2800,7 +2880,9 @@ en: index: title: "Notes submitted or commented on by %{user}" heading: "%{user}'s Notes" - subheading_html: "Notes submitted or commented on by %{user}" + subheading_html: "Notes %{submitted} or %{commented} by %{user}" + subheading_submitted: "submitted" + subheading_commented: "commented on" no_notes: No notes id: "Id" creator: "Creator" @@ -2813,15 +2895,15 @@ en: open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" - opened_by_html: "Created by %{user} %{when}" - opened_by_anonymous_html: "Created by anonymous %{when}" - commented_by_html: "Comment from %{user} %{when}" - commented_by_anonymous_html: "Comment from anonymous %{when}" - closed_by_html: "Resolved by %{user} %{when}" - closed_by_anonymous_html: "Resolved by anonymous %{when}" - reopened_by_html: "Reactivated by %{user} %{when}" - reopened_by_anonymous_html: "Reactivated by anonymous %{when}" - hidden_by_html: "Hidden by %{user} %{when}" + event_opened_by_html: "Created by %{user} %{time_ago}" + event_opened_by_anonymous_html: "Created by anonymous %{time_ago}" + event_commented_by_html: "Comment from %{user} %{time_ago}" + event_commented_by_anonymous_html: "Comment from anonymous %{time_ago}" + event_closed_by_html: "Resolved by %{user} %{time_ago}" + event_closed_by_anonymous_html: "Resolved by anonymous %{time_ago}" + event_reopened_by_html: "Reactivated by %{user} %{time_ago}" + event_reopened_by_anonymous_html: "Reactivated by anonymous %{time_ago}" + event_hidden_by_html: "Hidden by %{user} %{time_ago}" report: report this note coordinates_html: "%{latitude}, %{longitude}" anonymous_warning: This note includes comments from anonymous users which should be independently verified. @@ -2874,10 +2956,10 @@ en: locate: title: Show My Location metersPopup: - one: You are within one meter of this point + one: You are within %{count} meter of this point other: You are within %{count} meters of this point feetPopup: - one: You are within one foot of this point + one: You are within %{count} foot of this point other: You are within %{count} feet of this point base: standard: Standard @@ -2893,13 +2975,19 @@ en: gps: Public GPS Traces overlays: Enable overlays for troubleshooting the map title: "Layers" - copyright: "© OpenStreetMap contributors" - donate_link_text: "" - terms: "Website and API terms" - cyclosm: "Tiles style by CyclOSM hosted by OpenStreetMap France" - thunderforest: "Tiles courtesy of Andy Allan" - opnvkarte: "Tiles courtesy of MeMoMaps" - hotosm: "Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France" + copyright_text: "© %{copyright_link}" + openstreetmap_contributors: "OpenStreetMap contributors" + make_a_donation: Make a Donation + website_and_api_terms: Website and API terms + cyclosm_credit: "Tiles style by %{cyclosm_link} hosted by %{osm_france_link}" + cyclosm_name: CyclOSM + osm_france: OpenStreetMap France + thunderforest_credit: "Tiles courtesy of %{thunderforest_link}" + andy_allan: Andy Allan + opnvkarte_credit: "Tiles courtesy of %{memomaps_link}" + memomaps: MeMoMaps + hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}" + hotosm_name: Humanitarian OpenStreetMap Team site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map