Merge branch 'pull/5579'

diff --combined config/locales/en.yml
index a4910a544d4cf705e1cdb85de650a6399b403e57,ac3e029e3db5daa7ad5c53609a1beca33cdfa9c7..40b4bfa142997eaa20c2eabba88093012d753dee
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1512,7 -1512,7 +1512,7 @@@ en
        reports: Reports
        last_updated: Last Updated
        last_updated_time_ago_user_html: "%{time_ago} by %{user}"
 -      reporter_users: Reporter Users
 +      reporting_users: Reporting Users
        reports_count:
          one: "%{count} Report"
          other: "%{count} Reports"
@@@ -3069,6 -3069,7 +3069,7 @@@
        open_title: "Unresolved note #%{note_name}"
        closed_title: "Resolved note #%{note_name}"
        hidden_title: "Hidden note #%{note_name}"
+       description_when_author_is_deleted: "deleted"
        event_opened_by_html: "Created by %{user} %{time_ago}"
        event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
        event_commented_by_html: "Comment from %{user} %{time_ago}"