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

diff --combined config/locales/en.yml
index 986a30db9464c8ec0f88d73538f0460dbd73e79d,3511e7f63c894e36b071df46cd7e901d21031ad8..fbb1f956c81d9178adb55b92aaf0948f9f2eacd7
--- 1/config/locales/en.yml
--- 2/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"