Merge 17944:17988 from trunk.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e0902df8168618c338c09f721440e72df1a9ca38..fabfba040fb23175541f44c7877adecdc492b13c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1121,4 +1121,15 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
-
+  javascripts:
+    map:
+      base:
+        mapnik: Mapnik
+        osmarender: Osmarender
+        cycle_map: Cycle Map
+        noname: NoName
+      overlays:
+        maplint: Maplint
+    site:
+      edit_zoom_alert: You must zoom in to edit the map
+      history_zoom_alert: You must zoom in to see the editing history