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

[rails.git] / config / locales / en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8c7ef6cbb800a009df4af280dd0c4355a396dce5..36623479e042c26f39c59168b8a99189ca2d819d 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -22,6 +22,7 @@
 # Author: Meno25
 # Author: Mvolz
 # Author: Sampablokuper
+# Author: Samwilson
 # Author: Shirayuki
 # Author: Smsm1
 # Author: TomH
@@ -1304,16 +1305,13 @@ en-GB:
         under the same licence. See the <a href='%{copyright_path}'>Copyright and
         Licence page</a> for details.
       legal_title: Legal
-      legal_html: "This site and many other related services are formally operated
+      legal_1_html: "This site and many other related services are formally operated
         by the  \n<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a>
         (OSMF) \non behalf of the community. Use of all OSMF operated services is
         subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
         of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
         Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
-        Policy</a>\n<br> \nPlease <a href='https://osmfoundation.org/Contact'>contact
-        the OSMF</a> \nif you have licensing, copyright or other legal questions.\n<br>\nOpenStreetMap,
-        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>."
+        Policy</a>."
       partners_title: Partners
     copyright:
       foreign: