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

diff --combined config/locales/en.yml
index f635642c76811f91dda0d63dd810f306f3d9f676,f538502e80e133877990b657f8ff425f49e0256f..9142c2eda3dcce0a8f66bd7d517c2b0230d1d0c3
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1355,7 -1355,7 +1355,7 @@@ en
      about:
        next: Next
        copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
 -      used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
 +      used_by_html: "%{name} provides map data for 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.
@@@ -1419,30 -1419,26 +1419,30 @@@
            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).
 +        intro_3_1_html: |
 +          Our documentation is licensed under the 
 +          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
 +          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
          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: |
 +        credit_2_1_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
 +          Database License. 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: |
 +          'OpenStreetMap' to this full address) and to opendatacommons.org.
 +        credit_3_1_html: |
 +          The map tiles in the &ldquo;standard style&rdquo; at www.openstreetmap.org are a 
 +          Produced Work by the OpenStreetMap Foundation using OpenStreetMap data 
 +          under the Open Database License. If you are using these tiles please use 
 +          the following attribution: 
 +          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;. 
 +        credit_4_html: |
            For a browsable electronic map, the credit should appear in the corner of the map.
            For example:
          attribution_example:
@@@ -2448,7 -2444,7 +2448,7 @@@
        next: "Next »"
        previous: "« Previous"
    notes:
 -    mine:
 +    index:
        title: "Notes submitted or commented on by %{user}"
        heading: "%{user}'s notes"
        subheading_html: "Notes submitted or commented on by %{user}"
@@@ -2502,6 -2498,7 +2502,7 @@@
          cycle_map: Cycle Map
          transport_map: Transport Map
          hot: Humanitarian
+         opnvkarte: ÖPNVKarte
        layers:
          header: Map Layers
          notes: Map Notes
@@@ -2513,6 -2510,7 +2514,7 @@@
        donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
        terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
        thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
+       opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
        hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
      site:
        edit_tooltip: Edit the map