Make the node controller return the modified time for deleted nodes

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15fadd9dd3dd86baf939250f39739d85b5087bef..7e4d15aaf5d30c2a1e2481c17e3f43eac03070b2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1147,8 +1147,7 @@ en:
       subject_header: "[OpenStreetMap] %{subject}"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
-      footer1: "You can also read the message at %{readurl}"
-      footer2: "and you can reply at %{replyurl}"
+      footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
@@ -2037,13 +2036,20 @@ en:
       last_changed: "Last changed"
       ago_html: "%{when} ago"
   javascripts:
+    close: Close
     share:
       title: "Share"
       cancel: "Cancel"
+      link: "Link"
+      short_link: "Short Link"
+      long_link: "Long Link"
     key:
       title: "Map Key"
-      tooltip: "Key for the map"
+      tooltip: "Map Key"
     map:
+      zoom:
+        in: Zoom In
+        out: Zoom Out
       base:
         standard: Standard
         cycle_map: Cycle Map
@@ -2054,7 +2060,6 @@ en:
         notes: Map Notes
         data: Map Data
         overlays: Enable overlays for troubleshooting the map
-        base: OSM provides the underlying data for all these maps
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map