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

diff --combined config/locales/en.yml
index c423de766639981d375023147fe282ac9e8115c8,4fdc9741ce18ce10c49dbfe24c771862958de765..c3a0c5aed0802f2afe1c8acaf4eafee1f5c7e8e4
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -59,7 -59,6 +59,7 @@@ en
        message: "Message"
        node: "Node"
        node_tag: "Node Tag"
 +      note: "Note"
        old_node: "Old Node"
        old_node_tag: "Old Node Tag"
        old_relation: "Old Relation"
@@@ -357,7 -356,8 +357,7 @@@
          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."
@@@ -1477,10 -1477,7 +1477,10 @@@
          open: Open
          resolved: Resolved
      show:
 -      title: "%{status} Issue #%{issue_id}"
 +      title:
 +        open: "Open Issue #%{issue_id}"
 +        ignored: "Ignored Issue #%{issue_id}"
 +        resolved: "Resolved Issue #%{issue_id}"
        reports:
          one: "%{count} report"
          other: "%{count} reports"
@@@ -2547,7 -2544,7 +2547,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"
@@@ -2898,6 -2895,15 +2898,15 @@@
          years:
            one: "%{count} year"
            other: "%{count} years"
+       short:
+         ended: "ended"
+         revoked_html: "revoked by %{name}"
+         active: "active"
+         active_unread: "active unread"
+         expired_unread: "expired unread"
+         read_html: "read at %{time}"
+         time_in_future_title: "%{time_absolute}; in %{time_relative}"
+         time_in_past_title: "%{time_absolute}; %{time_relative}"
      blocks_on:
        title: "Blocks on %{name}"
        heading_html: "List of Blocks on %{name}"
@@@ -2916,15 -2922,15 +2925,15 @@@
        reason: "Reason for block:"
        revoker: "Revoker:"
      block:
-       not_revoked: "(not revoked)"
        show: "Show"
        edit: "Edit"
      page:
        display_name: "Blocked User"
        creator_name: "Creator"
        reason: "Reason for block"
+       start: "Start"
+       end: "End"
        status: "Status"
-       revoker_name: "Revoked by"
      navigation:
        all_blocks: "All Blocks"
        blocks_on_me: "Blocks on Me"