From: Tom Hughes <tom@compton.nu>
Date: Wed, 4 Dec 2024 18:59:21 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5374'
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/HEAD?ds=sidebyside;hp=-c

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

0b97b6bc343d8428367e5fa91ef41e95386880f7
diff --combined config/locales/en.yml
index 986a30db9,3511e7f63..fbb1f956c
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -356,8 -356,7 +356,7 @@@ en
          way: "Way"
          relation: "Relation"
      containing_relation:
-       entry_html: "Relation %{relation_name}"
-       entry_role_html: "Relation %{relation_name} (as %{relation_role})"
+       entry_role_html: "%{relation_name} (as %{relation_role})"
      not_found:
        title: Not Found
        sorry: "Sorry, %{type} #%{id} could not be found."
@@@ -2544,7 -2543,7 +2543,7 @@@
        upload_trace: "Upload a trace"
        all_traces: "All Traces"
        my_traces: "My Traces"
 -      traces_from: "Public Traces from %{user}"
 +      traces_from_html: "Public Traces from %{user}"
        remove_tag_filter: "Remove Tag Filter"
      destroy:
        scheduled_for_deletion: "Trace scheduled for deletion"