From: Tom Hughes <tom@compton.nu>
Date: Fri, 3 Jan 2025 19:21:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5458'
X-Git-Tag: live~340
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/44ec0e02fc259d3a41a8e48da02ebd54f48e241b?ds=inline;hp=-c

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

44ec0e02fc259d3a41a8e48da02ebd54f48e241b
diff --combined config/locales/en.yml
index 9d1d8476f,2a34c0a59..72632d1e8
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1752,8 -1752,6 +1752,6 @@@ en
        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"
@@@ -1813,6 -1811,9 +1811,9 @@@
          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"
@@@ -2972,7 -2973,8 +2973,7 @@@
          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}"