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 23307bdc53b641dfaefdcc7d0001b04798eb0bd2..6403087ef0a6b8e41485533ba6d331e8d90ec38a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2191,7 +2191,7 @@ en:
     key:
       title: "Map Key"
       tooltip: "Map Key"
     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
     map:
       zoom:
         in: Zoom In