Merge remote-tracking branch 'upstream/pull/5458'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f2174206548e2f5267daf6ad4c39a896c9e710d..72632d1e8af9a7a55cbfb3d020c8b544464e8a00 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1752,8 +1752,6 @@ en:
       title: "No such message"
       heading: "No such message"
       body: "Sorry there is no message with that id."
       title: "No such message"
       heading: "No such message"
       body: "Sorry there is no message with that id."

-    reply:
-      wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."

     show:
       title: "Read message"
       reply_button: "Reply"
     show:
       title: "Read message"
       reply_button: "Reply"


@@ -1813,6 +1811,9 @@ en:
         people_mapping_nearby: "people mapping nearby"
       message:
         destroy_button: "Delete"
         people_mapping_nearby: "people mapping nearby"
       message:
         destroy_button: "Delete"

+    replies:
+      new:
+        wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."

   passwords:
     new:
       title: "Lost password"
   passwords:
     new:
       title: "Lost password"


@@ -2972,8 +2973,7 @@ en:
         ended: "ended"
         revoked_html: "revoked by %{name}"
         active: "active"
         ended: "ended"
         revoked_html: "revoked by %{name}"
         active: "active"

-        active_unread: "active unread"
-        expired_unread: "expired unread"
+        active_until_read: "active until read"

         read_html: "read at %{time}"
         time_in_future_title: "%{time_absolute}; in %{time_relative}"
         time_in_past_title: "%{time_absolute}; %{time_relative}"
         read_html: "read at %{time}"
         time_in_future_title: "%{time_absolute}; in %{time_relative}"
         time_in_past_title: "%{time_absolute}; %{time_relative}"