From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Feb 2018 07:46:25 +0000 (+0800)
Subject: Merge branch 'master' into moderation
X-Git-Tag: live~3590^2~45
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493

Merge branch 'master' into moderation
---

424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493
diff --cc config/locales/en.yml
index 40237b63b,2412a2b9c..a40f15719
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1326,14 -1278,16 +1382,16 @@@ en
        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 
 +      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>
 +      Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
 +      if you have licensing, copyright or other legal questions and issues.
+       <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: