merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 61c82211e2531269bb9dbd6d7cb747efefc97a59..6403087ef0a6b8e41485533ba6d331e8d90ec38a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1229,7 +1229,7 @@ en:
       on behalf of the community. Use of all OSMF operated services is subject 
       to our <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
       Acceptable Use Policies</a> and our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
-      <br>
+      <br> 
       Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a> 
       if you have licensing, copyright or other legal questions and issues.
     partners_title: Partners
@@ -2191,7 +2191,7 @@ en:
     key:
       title: "Map Key"
       tooltip: "Map Key"
-      tooltip_disabled: "Map Key available only for Standard layer"
+      tooltip_disabled: "Map Key not available for this layer"
     map:
       zoom:
         in: Zoom In