From: Tom Hughes <tom@compton.nu>
Date: Sun, 26 Jan 2025 10:24:05 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5551'
X-Git-Tag: live~244
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6316745c2ed5a098102f6a18d547f86bd98d7511?ds=inline;hp=-c

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

6316745c2ed5a098102f6a18d547f86bd98d7511
diff --combined config/locales/en.yml
index da3afb2ee,d528309f1..38b810d1f
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -392,6 -392,7 +392,7 @@@ en
          relation: "relation"
      start_rjs:
        feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"
+       feature_error: "Features could not be loaded: %{message}"
        load_data: "Load Data"
        loading: "Loading..."
      tag_details:
@@@ -1782,17 -1783,14 +1783,17 @@@
        destroy_button: "Delete"
        back: "Back"
        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 log in as the correct user in order to read it."
 -    mark:
 -      as_read: "Message marked as read"
 -      as_unread: "Message marked as unread"
 -    unmute:
 -      notice: "Message has been moved to Inbox"
 -      error: "The message could not be moved to the Inbox."
      destroy:
        destroyed: "Message deleted"
 +    read_marks:
 +      create:
 +        notice: "Message marked as read"
 +      destroy:
 +        notice: "Message marked as unread"
 +    mutes:
 +      destroy:
 +        notice: "Message has been moved to Inbox"
 +        error: "The message could not be moved to the Inbox."
      mailboxes:
        heading:
          my_inbox: "My Inbox"