Succint button copy + force single line grouped buttons

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8be56bd3dbb7117f6bb147b8bd32179f63ae6c45..06944ce4e3ee70bd0b0f7c0e87ab2ed279e12be5 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."
@@ -1292,9 +1291,8 @@ en:
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
+      back: "Back"
       to: "To"
-      back_to_outbox: "Back to outbox"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
       delete_button: "Delete"
@@ -2037,15 +2035,20 @@ en:
       last_changed: "Last changed"
       ago_html: "%{when} ago"
   javascripts:
+    close: Close
     share:
       title: "Share"
       cancel: "Cancel"
       link: "Link"
-      short_url: "Short URL"
+      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
@@ -2056,7 +2059,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