From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Apr 2018 18:37:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1809'
X-Git-Tag: live~3645
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/8bd001f1282b7a33a71c0565504e160dbe567d5d?hp=-c

Merge remote-tracking branch 'upstream/pull/1809'
---

8bd001f1282b7a33a71c0565504e160dbe567d5d
diff --combined config/locales/en.yml
index 9e923185d,2fdee0b2d..fd0317df1
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -323,6 -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 <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (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:
@@@ -968,6 -1009,285 +968,6 @@@
        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<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
 -        href="https://opendatacommons.org/licenses/odbl/">Open Data
 -        Commons Open Database License</a> (ODbL) by the  <a
 -        href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (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 <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
 -        code</a> explains your rights and responsibilities.
 -      intro_3_html: |
 -        The cartography in our map tiles, and our documentation, are
 -        licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
 -        Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
 -      credit_title_html: How to credit OpenStreetMap
 -      credit_1_html: |
 -        We require that you use the credit &ldquo;&copy; OpenStreetMap
 -        contributors&rdquo;.
 -      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
 -        <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
 -        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 <a
 -        href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
 -      more_2_html: |
 -        Although OpenStreetMap is open data, we cannot provide a
 -        free-of-charge map API for third-parties.
 -        See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
 -        <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
 -        and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
 -      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: |
 -        <strong>Austria</strong>: Contains data from
 -        <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
 -        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
 -        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
 -        Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
 -      contributors_ca_html: |
 -        <strong>Canada</strong>: Contains data from
 -        GeoBase&reg;, GeoGratis (&copy; Department of Natural
 -        Resources Canada), CanVec (&copy; Department of Natural
 -        Resources Canada), and StatCan (Geography Division,
 -        Statistics Canada).
 -      contributors_fi_html: |
 -        <strong>Finland</strong>: Contains data from the
 -        National Land Survey of Finland's Topographic Database
 -        and other datasets, under the
 -        <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.
 -      contributors_fr_html: |
 -        <strong>France</strong>: Contains data sourced from
 -        Direction Générale des Impôts.
 -      contributors_nl_html: |
 -        <strong>Netherlands</strong>: Contains &copy; AND data, 2007
 -        (<a href="https://www.and.com">www.and.com</a>)
 -      contributors_nz_html: |
 -        <strong>New Zealand</strong>: Contains data sourced from
 -        Land Information New Zealand. Crown Copyright reserved.
 -      contributors_si_html: |
 -        <strong>Slovenia</strong>: Contains data from the
 -        <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
 -        <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
 -        (public information of Slovenia).
 -      contributors_za_html: |
 -        <strong>South Africa</strong>: Contains data sourced from
 -        <a href="http://www.ngi.gov.za/">Chief Directorate:
 -        National Geo-Spatial Information</a>, State copyright reserved.
 -      contributors_gb_html: |
 -        <strong>United Kingdom</strong>: Contains Ordnance
 -        Survey data &copy; 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 <a
 -        href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
 -        page</a> 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 <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
 -        procedure</a> or file directly at our
 -        <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
 -      trademarks_title_html: <span id="trademarks"></span>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 <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
 -  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 <em>real and current</em> -
 -        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 <em>doesn't</em> 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 <strong>editor</strong> is a program or website you can use to edit the map.
 -      node_html: |
 -        A <strong>node</strong> is a point on the map, like a single restaurant or a tree.
 -      way_html: |
 -        A <strong>way</strong> is a line or area, like a road, stream, lake or building.
 -      tag_html: |
 -        A <strong>tag</strong> 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
 -        <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
 -        <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
 -    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.
 -        <a href='%{help_url}'>Get help here</a>.
 -    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 <a href='%{map_url}'>the map</a> and click the note icon:
 -        <span class='icon note'></span>. 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 <a class='icon note'></a> 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
 -        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
 -        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
 -  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: <span>&copy;</span>OpenStreetMap<br>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
 -      <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
 -      <a href='%{diary_path}'>user diaries</a>,
 -      <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and
 -      the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
 -    open_data_title: Open Data
 -    open_data_html: |
 -      OpenStreetMap is <i>open data</i>: 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 <a href='%{copyright_path}'>Copyright and
 -      License page</a> for details.
 -    legal_title: Legal
 -    legal_html: |
 -      This site and many other related services are formally operated by the
 -      <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
 -      on behalf of the community. Use of all OSMF operated services is subject
 -      to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
 -      Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
 -      <br>
 -      Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
 -      if you have licensing, copyright or other legal questions.
 -      <br>
 -      OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
 -    partners_title: Partners
    notifier:
      diary_comment_notification:
        subject: "[OpenStreetMap] %{user} commented on a diary entry"
@@@ -1126,175 -1446,6 +1126,175 @@@
      delete:
        deleted: "Message deleted"
    site:
 +    about:
 +      next: Next
 +      copyright_html: <span>&copy;</span>OpenStreetMap<br>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
 +        <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
 +        <a href='%{diary_path}'>user diaries</a>,
 +        <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and
 +        the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
 +      open_data_title: Open Data
 +      open_data_html: |
 +        OpenStreetMap is <i>open data</i>: 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 <a href='%{copyright_path}'>Copyright and
 +        License page</a> for details.
 +      legal_title: Legal
 +      legal_html: |
 +        This site and many other related services are formally operated by the
 +        <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
 +        on behalf of the community. Use of all OSMF operated services is subject
 +        to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
 +        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
 +        <br>
 +        Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
 +        if you have licensing, copyright or other legal questions.
 +        <br>
 +        OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
 +      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<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
 +          href="https://opendatacommons.org/licenses/odbl/">Open Data
 +          Commons Open Database License</a> (ODbL) by the  <a
 +          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (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 <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
 +          code</a> explains your rights and responsibilities.
 +        intro_3_html: |
 +          The cartography in our map tiles, and our documentation, are
 +          licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
 +          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
 +        credit_title_html: How to credit OpenStreetMap
 +        credit_1_html: |
 +          We require that you use the credit &ldquo;&copy; OpenStreetMap
 +          contributors&rdquo;.
 +        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
 +          <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
 +          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 <a
 +          href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
 +        more_2_html: |
 +          Although OpenStreetMap is open data, we cannot provide a
 +          free-of-charge map API for third-parties.
 +          See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
 +          <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
 +          and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
 +        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: |
 +          <strong>Austria</strong>: Contains data from
 +          <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
 +          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
 +          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
 +          Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
 +        contributors_ca_html: |
 +          <strong>Canada</strong>: Contains data from
 +          GeoBase&reg;, GeoGratis (&copy; Department of Natural
 +          Resources Canada), CanVec (&copy; Department of Natural
 +          Resources Canada), and StatCan (Geography Division,
 +          Statistics Canada).
 +        contributors_fi_html: |
 +          <strong>Finland</strong>: Contains data from the
 +          National Land Survey of Finland's Topographic Database
 +          and other datasets, under the
 +          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.
 +        contributors_fr_html: |
 +          <strong>France</strong>: Contains data sourced from
 +          Direction Générale des Impôts.
 +        contributors_nl_html: |
 +          <strong>Netherlands</strong>: Contains &copy; AND data, 2007
 +          (<a href="https://www.and.com">www.and.com</a>)
 +        contributors_nz_html: |
 +          <strong>New Zealand</strong>: Contains data sourced from
 +          Land Information New Zealand. Crown Copyright reserved.
 +        contributors_si_html: |
 +          <strong>Slovenia</strong>: Contains data from the
 +          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
 +          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
 +          (public information of Slovenia).
 +        contributors_za_html: |
 +          <strong>South Africa</strong>: Contains data sourced from
 +          <a href="http://www.ngi.gov.za/">Chief Directorate:
 +          National Geo-Spatial Information</a>, State copyright reserved.
 +        contributors_gb_html: |
 +          <strong>United Kingdom</strong>: Contains Ordnance
 +          Survey data &copy; 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 <a
 +          href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
 +          page</a> 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 <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
 +          procedure</a> or file directly at our
 +          <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
 +        trademarks_title_html: <span id="trademarks"></span>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 <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
      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."
@@@ -1319,103 -1470,6 +1319,103 @@@
        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 <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (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 <a class='icon note'></a> 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
 +          <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
 +          <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
 +    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
@@@ -1516,59 -1570,6 +1516,59 @@@
        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 <em>real and current</em> -
 +          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 <em>doesn't</em> 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 <strong>editor</strong> is a program or website you can use to edit the map.
 +        node_html: |
 +          A <strong>node</strong> is a point on the map, like a single restaurant or a tree.
 +        way_html: |
 +          A <strong>way</strong> is a line or area, like a road, stream, lake or building.
 +        tag_html: |
 +          A <strong>tag</strong> 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
 +          <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
 +          <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
 +      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.
 +          <a href='%{help_url}'>Get help here</a>.
 +      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 <a href='%{map_url}'>the map</a> and click the note icon:
 +          <span class='icon note'></span>. 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)"
@@@ -1635,7 -1636,6 +1635,7 @@@
        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 +1689,7 @@@
        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 +1701,11 @@@
        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 +2107,7 @@@
        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,6 -2158,20 +2158,6 @@@
      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."
@@@ -2187,22 -2201,8 +2187,22 @@@
        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"
@@@ -2377,11 -2377,11 +2377,11 @@@
          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}"
        time: "Time"
@@@ -2399,7 -2399,7 +2399,7 @@@
        show_address: Show address
        query_features: Query features
        centre_map: Centre map here
 -  redaction:
 +  redactions:
      edit:
        description: "Description"
        heading: "Edit redaction"