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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b190c2ca0bca1924078caeeee55e052b08aa7e06..986a30db9464c8ec0f88d73538f0460dbd73e79d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2544,7 +2544,7 @@ en:
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"
       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"
       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"